summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--give-cc-to-gir-scanner.mingw.patch11
-rw-r--r--poppler_pkgconfig_private_libs.patch32
2 files changed, 0 insertions, 43 deletions
diff --git a/give-cc-to-gir-scanner.mingw.patch b/give-cc-to-gir-scanner.mingw.patch
deleted file mode 100644
index dc2ed35533fc..000000000000
--- a/give-cc-to-gir-scanner.mingw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- poppler-0.24.5/glib/Makefile.am.orig 2014-04-17 01:22:10.962400000 +0400
-+++ poppler-0.24.5/glib/Makefile.am 2014-04-17 01:23:09.634000000 +0400
-@@ -90,6 +90,8 @@
- if HAVE_INTROSPECTION
- -include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS =
-+INTROSPECTION_SCANNER_ENV = \
-+ CC="$(CC)"
- INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
- INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
-
diff --git a/poppler_pkgconfig_private_libs.patch b/poppler_pkgconfig_private_libs.patch
deleted file mode 100644
index 6e3df56258bc..000000000000
--- a/poppler_pkgconfig_private_libs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -rupN poppler-0.24.5/poppler-cpp.pc.in poppler-0.24.5-new/poppler-cpp.pc.in
---- poppler-0.24.5/poppler-cpp.pc.in 2013-08-17 01:20:41.000000000 +0200
-+++ poppler-0.24.5-new/poppler-cpp.pc.in 2014-04-23 13:32:14.000000000 +0200
-@@ -11,3 +11,4 @@ Requires: @PC_REQUIRES@
-
- Libs: -L${libdir} -lpoppler-cpp
- Cflags: -I${includedir}/poppler/cpp
-+Libs.private: @LIBICONV@
-diff -rupN poppler-0.24.5/poppler.pc.in poppler-0.24.5-new/poppler.pc.in
---- poppler-0.24.5/poppler.pc.in 2013-08-17 01:20:41.000000000 +0200
-+++ poppler-0.24.5-new/poppler.pc.in 2014-04-23 13:35:57.000000000 +0200
-@@ -9,3 +9,4 @@ Version: @VERSION@
-
- Libs: -L${libdir} -lpoppler
- Cflags: -I${includedir}/poppler
-+Libs.private: @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBTIFF_LIBS@ @LIBOPENJPEG_LIBS@ @ZLIB_LIBS@ @LIBCURL_LIBS@ @LCMS_LIBS@
-diff -rupN poppler-0.24.5/poppler-qt4.pc.in poppler-0.24.5-new/poppler-qt4.pc.in
---- poppler-0.24.5/poppler-qt4.pc.in 2013-08-17 01:20:41.000000000 +0200
-+++ poppler-0.24.5-new/poppler-qt4.pc.in 2014-04-25 23:48:47.305320647 +0200
-@@ -11,3 +11,4 @@ Requires: @PC_REQUIRES@
-
- Libs: -L${libdir} -lpoppler-qt4
- Cflags: -I${includedir}/poppler/qt4
-+Libs.private: @POPPLER_QT4_LIBS@
-diff -rupN poppler-0.24.5/poppler-qt5.pc.in poppler-0.24.5-new/poppler-qt5.pc.in
---- poppler-0.24.5/poppler-qt5.pc.in 2013-08-17 01:20:41.000000000 +0200
-+++ poppler-0.24.5-new/poppler-qt5.pc.in 2014-04-25 23:48:41.961239691 +0200
-@@ -11,3 +11,4 @@ Requires: @PC_REQUIRES@
-
- Libs: -L${libdir} -lpoppler-qt5
- Cflags: -I${includedir}/poppler/qt5
-+Libs.private: @POPPLER_QT5_LIBS@