From 1945a19de62de698257b56834f76056582e567f3 Mon Sep 17 00:00:00 2001
From: Alexej Harm <alexej.h@xiphos.de>
Date: Sat, 23 Mar 2019 11:07:21 +0100
Subject: [giflib] Changed library linkage to static.

---
 ports/giflib/CONTROL        | 2 +-
 ports/giflib/portfile.cmake | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/giflib/CONTROL b/ports/giflib/CONTROL
index a79a8b0d4..58039fc98 100644
--- a/ports/giflib/CONTROL
+++ b/ports/giflib/CONTROL
@@ -1,3 +1,3 @@
 Source: giflib
-Version: 5.1.4-1
+Version: 5.1.4-2
 Description: A library for reading and writing gif images.
diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake
index ee7f96449..d89e74aa4 100644
--- a/ports/giflib/portfile.cmake
+++ b/ports/giflib/portfile.cmake
@@ -1,11 +1,16 @@
 include(vcpkg_common_functions)
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/giflib-5.1.4)
 vcpkg_download_distfile(ARCHIVE
     URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-5.1.4.tar.bz2"
     FILENAME "giflib-5.1.4.tar.bz2"
     SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 )
+
 vcpkg_extract_source_archive(${ARCHIVE})
+
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_apply_patches(
-- 
cgit v1.2.3


From 6588b55361e0e2fa533e64a656e085382c444bb2 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 26 Mar 2019 17:31:19 -0700
Subject: [giflib] Modernize. Avoid use of WINDOWS_EXPORT_ALL_SYMBOLS.

---
 ports/giflib/CMakeLists.txt |  5 +----
 ports/giflib/CONTROL        |  2 +-
 ports/giflib/portfile.cmake | 19 +++++++++----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/ports/giflib/CMakeLists.txt b/ports/giflib/CMakeLists.txt
index e9b6a17c6..ae7d47447 100644
--- a/ports/giflib/CMakeLists.txt
+++ b/ports/giflib/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 
-project(giflib)
+project(giflib C)
 
 set(GIFLIB_HEADERS
     lib/gif_lib.h
@@ -18,9 +18,6 @@ set(GIFLIB_SOURCES
 )
 
 add_library(gif ${GIFLIB_SOURCES})
-if (BUILD_SHARED_LIBS)
-    set_property(TARGET gif PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
-endif ()
 
 if (NOT GIFLIB_SKIP_HEADERS)
     install(FILES ${GIFLIB_HEADERS} DESTINATION include)
diff --git a/ports/giflib/CONTROL b/ports/giflib/CONTROL
index 58039fc98..169ddbd92 100644
--- a/ports/giflib/CONTROL
+++ b/ports/giflib/CONTROL
@@ -1,3 +1,3 @@
 Source: giflib
-Version: 5.1.4-2
+Version: 5.1.4-3
 Description: A library for reading and writing gif images.
diff --git a/ports/giflib/portfile.cmake b/ports/giflib/portfile.cmake
index d89e74aa4..1747ce3c2 100644
--- a/ports/giflib/portfile.cmake
+++ b/ports/giflib/portfile.cmake
@@ -2,23 +2,22 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/giflib-5.1.4)
+set(GIFLIB_VERSION 5.1.4)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-5.1.4.tar.bz2"
-    FILENAME "giflib-5.1.4.tar.bz2"
+    URLS "http://downloads.sourceforge.net/sourceforge/giflib/giflib-${GIFLIB_VERSION}.tar.bz2"
+    FILENAME "giflib-${GIFLIB_VERSION}.tar.bz2"
     SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d
 )
 
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${GIFLIB_VERSION}
+    PATCHES msvc-guard-unistd-h.patch
+)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/msvc-guard-unistd-h.patch
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS_DEBUG
-- 
cgit v1.2.3