diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-12-30 10:39:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-30 10:39:50 -0800 |
| commit | 38c6fbd0c7b02f7d73a397fc5490bcbec605e791 (patch) | |
| tree | e51cc23e91c7d583d9312f723efe7907f9ea0bfe | |
| parent | 5321ed169c42af52ee8727f3d86bb06b41638870 (diff) | |
| download | vcpkg-38c6fbd0c7b02f7d73a397fc5490bcbec605e791.tar.gz vcpkg-38c6fbd0c7b02f7d73a397fc5490bcbec605e791.zip | |
[glib] Fix pkgconfig files (#15360)
* [glib] Fix pkgconfig files
* Use GLIB_VERSION instead
| -rw-r--r-- | ports/glib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glib/fix_pkgconfig.patch | 30 | ||||
| -rw-r--r-- | ports/glib/portfile.cmake | 1 |
4 files changed, 33 insertions, 1 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 144f11776..b0ee220aa 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -357,6 +357,7 @@ message(STATUS " " ${CHARSET_LIBRARY}) message(STATUS " " ${FFI_LIBRARY}) message(STATUS " " ${Intl_LIBRARIES}) +set(VERSION ${GLIB_VERSION}) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${CMAKE_INSTALL_PREFIX}) set(libdir ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index a842f65e8..48501faaa 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,6 +1,6 @@ Source: glib Version: 2.52.3 -Port-Version: 24 +Port-Version: 25 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/fix_pkgconfig.patch b/ports/glib/fix_pkgconfig.patch new file mode 100644 index 000000000..e429120f2 --- /dev/null +++ b/ports/glib/fix_pkgconfig.patch @@ -0,0 +1,30 @@ +diff --git a/gio-unix-2.0.pc.in b/gio-unix-2.0.pc.in
+index fba58e2..2d015f6 100644
+--- a/gio-unix-2.0.pc.in
++++ b/gio-unix-2.0.pc.in
+@@ -8,4 +8,4 @@ Description: unix specific headers for glib I/O library
+ Version: @VERSION@
+ Requires: gobject-2.0,gio-2.0
+ Libs: -L${libdir} -lgio-2.0
+-Cflags: -I${includedir}/gio-unix-2.0/
++Cflags: -I${includedir}/gio
+diff --git a/gio-windows-2.0.pc.in b/gio-windows-2.0.pc.in
+index 77eecdf..25bb0ae 100644
+--- a/gio-windows-2.0.pc.in
++++ b/gio-windows-2.0.pc.in
+@@ -8,4 +8,4 @@ Description: Windows specific headers for glib I/O library
+ Version: @VERSION@
+ Requires: gobject-2.0,gmodule-no-export-2.0,gio-2.0
+ Libs: -L${libdir} -lgio-2.0
+-Cflags: -I${includedir}/gio-win32-2.0/
++Cflags: -I${includedir}/gio
+diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in
+index 275fc01..1bfd74a 100644
+--- a/glib-2.0.pc.in
++++ b/glib-2.0.pc.in
+@@ -13,4 +13,4 @@ Version: @VERSION@
+ Requires.private: @PCRE_REQUIRES@
+ Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
+ Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@ @CARBON_LIBS@ @COCOA_LIBS@
+-Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
++Cflags: -I${includedir}/glib @GLIB_EXTRA_CFLAGS@
diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index dac83ab90..099886a3c 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_extract_source_archive_ex( use-libiconv-on-windows.patch arm64-defines.patch fix-arm-builds.patch + fix_pkgconfig.patch ) configure_file(${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${SOURCE_PATH}/CMakeLists.txt COPYONLY) |