summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cowgill <jcowgill@debian.org>2018-10-16 23:10:08 +0100
committerJames Cowgill <jcowgill@debian.org>2018-10-16 23:12:46 +0100
commit2ae3c0fd7b93cf8ec3143ce3fa8b544ad58d6415 (patch)
treee67c4e9f259d524be228d7f45f1313636393d25d
parent7fdf6c7358ee7384b6c409ff753666a2d761645b (diff)
d/patches: Drop cmake pkgconfig patches
These patches are obsolete in 2.5.1 and the issues have been fixed upstream with cleaner fixes.
-rw-r--r--debian/patches/03_pkgconfig-cleanup.patch41
-rw-r--r--debian/patches/04_pkgconfig-freebsd.patch30
-rw-r--r--debian/patches/series2
3 files changed, 0 insertions, 73 deletions
diff --git a/debian/patches/03_pkgconfig-cleanup.patch b/debian/patches/03_pkgconfig-cleanup.patch
deleted file mode 100644
index 915bae0..0000000
--- a/debian/patches/03_pkgconfig-cleanup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Cleanup duplicated pkg-config code
- Some parts of the pkg-config code released with 2.5.0 were duplicated and make
- adjusting the pkg-config paths more complicated. Fix this by simply removing
- the old code (which should be removed anyway).
-Author: James Cowgill <jcowgill@debian.org>
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -269,30 +269,6 @@ if(SFML_OS_MACOSX)
- set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
- endif()
-
--if(SFML_OS_LINUX OR SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
-- set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
-- if(SFML_OS_FREEBSD OR SFML_OS_OPENBSD)
-- set(PKGCONFIG_DIR libdata/pkgconfig)
-- endif()
-- if(BUILD_SHARED_LIBS)
-- sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
-- if(SFML_INSTALL_PKGCONFIG_FILES)
-- foreach(sfml_module IN ITEMS all system window graphics audio network)
-- CONFIGURE_FILE(
-- "tools/pkg-config/sfml-${sfml_module}.pc.in"
-- "tools/pkg-config/sfml-${sfml_module}.pc"
-- @ONLY)
-- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${PKGCONFIG_DIR}")
-- endforeach()
-- endif()
-- else()
-- if(SFML_INSTALL_PKGCONFIG_FILES)
-- message(WARNING "No pkg-config files are provided for the static SFML libraries (SFML_INSTALL_PKGCONFIG_FILES will be ignored).")
-- endif()
-- endif()
--endif()
--
- # enable project folders
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake")
diff --git a/debian/patches/04_pkgconfig-freebsd.patch b/debian/patches/04_pkgconfig-freebsd.patch
deleted file mode 100644
index df3f5be..0000000
--- a/debian/patches/04_pkgconfig-freebsd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Install FreeBSD pkgconfig files in lib/pkgconfig again
-Author: James Cowgill <jcowgill@debian.org>
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/cmake/Config.cmake
-+++ b/cmake/Config.cmake
-@@ -69,18 +69,10 @@ else()
- return()
- endif()
-
--# check if OS or package system supports pkg-config
--# this could be e.g. macports on mac or msys2 on windows etc.
--find_package(PkgConfig QUIET)
--if(PKG_CONFIG_EXECUTABLE)
-- if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
-- set(SFML_OS_SUPPORTS_PKGCONFIG ON)
-- set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
-- elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
-- set(SFML_OS_SUPPORTS_PKGCONFIG ON)
-- set(SFML_OS_PKGCONFIG_DIR "/libdata/pkgconfig")
-- endif()
--endif()
-+# on Debian, always install pkg-config files, and always into the default
-+# $libdir path
-+set(SFML_OS_SUPPORTS_PKGCONFIG ON)
-+set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
-
- # detect the compiler and its version
- # Note: on some platforms (OS X), CMAKE_COMPILER_IS_GNUCXX is true
diff --git a/debian/patches/series b/debian/patches/series
index 51f1523..84eff50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
01_remove-googleapi-css.patch
02_build-doc-once.patch
-03_pkgconfig-cleanup.patch
-04_pkgconfig-freebsd.patch
05_cmake-config-LIB_SIFFIX.patch
06_pkgconfig-libs-private.patch