OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

107 lines
3.5 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../poppler/poppler-0.5.4-fontconfig.patch
  5. # Copyright (C) 2006 - 2007 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Problem: poppler doesn't inject fontconfig CFLAGS and LIBS
  17. Bug-Report: https://bugs.freedesktop.org/show_bug.cgi?id=8415
  18. [Note]
  19. The patch was send upstream and one of the poppler maintainers said that he will
  20. fix the problem within the next days. ( 2006-09-25 morfoh)
  21. diff -ruN poppler-0.5.4-orig/glib/Makefile.am poppler-0.5.4/glib/Makefile.am
  22. --- poppler-0.5.4-orig/glib/Makefile.am 2006-05-20 00:09:00.000000000 +0200
  23. +++ poppler-0.5.4/glib/Makefile.am 2006-09-25 14:56:24.000000000 +0200
  24. @@ -17,6 +17,7 @@
  25. $(cairo_includes) \
  26. $(POPPLER_GLIB_CFLAGS) \
  27. $(FREETYPE_CFLAGS) \
  28. + $(FONTCONFIG_CFLAGS) \
  29. $(cairo_includes)
  30. stamp_files = stamp-poppler-enums.h
  31. @@ -84,6 +85,7 @@
  32. $(top_builddir)/poppler/libpoppler.la \
  33. $(POPPLER_GLIB_LIBS) \
  34. $(FREETYPE_LIBS) \
  35. + $(FONTCONFIG_LIBS) \
  36. $(cairo_libs)
  37. libpoppler_glib_la_LDFLAGS = -version-info 1:0:0
  38. diff -ruN poppler-0.5.4-orig/qt/Makefile.am poppler-0.5.4/qt/Makefile.am
  39. --- poppler-0.5.4-orig/qt/Makefile.am 2006-07-24 21:04:50.000000000 +0200
  40. +++ poppler-0.5.4/qt/Makefile.am 2006-09-25 14:57:22.000000000 +0200
  41. @@ -4,7 +4,8 @@
  42. $(cairo_includes) \
  43. $(POPPLER_QT_CXXFLAGS) \
  44. $(SPLASH_CFLAGS) \
  45. - $(FREETYPE_CFLAGS)
  46. + $(FREETYPE_CFLAGS) \
  47. + $(FONTCONFIG_CFLAGS)
  48. poppler_includedir = $(includedir)/poppler
  49. @@ -26,7 +27,8 @@
  50. libpoppler_qt_la_LIBADD = \
  51. $(top_builddir)/poppler/libpoppler.la \
  52. $(POPPLER_QT_LIBS) \
  53. - $(FREETYPE_LIBS)
  54. + $(FREETYPE_LIBS) \
  55. + $(FONTCONFIG_LIBS)
  56. libpoppler_qt_la_LDFLAGS = -version-info 1:0:0
  57. diff -ruN poppler-0.5.4-orig/test/Makefile.am poppler-0.5.4/test/Makefile.am
  58. --- poppler-0.5.4-orig/test/Makefile.am 2006-04-12 00:23:28.000000000 +0200
  59. +++ poppler-0.5.4/test/Makefile.am 2006-09-25 14:59:37.000000000 +0200
  60. @@ -33,7 +33,8 @@
  61. -I$(top_srcdir)/glib \
  62. -I$(top_builddir)/glib \
  63. $(cairo_includes) \
  64. - $(GTK_TEST_CFLAGS)
  65. + $(GTK_TEST_CFLAGS) \
  66. + $(FONTCONFIG_CFLAGS)
  67. noinst_PROGRAMS = $(gtk_splash_test) $(gtk_cairo_test) $(pdf_inspector)
  68. @@ -51,7 +52,8 @@
  69. $(top_builddir)/poppler/libpoppler.la \
  70. $(top_builddir)/glib/libpoppler-glib.la \
  71. $(CAIRO_LIBS) \
  72. - $(GTK_TEST_LIBS)
  73. + $(GTK_TEST_LIBS) \
  74. + $(FONTCONFIG_LIBS)
  75. pdf_inspector_SOURCES = \
  76. pdf-inspector.cc
  77. diff -ruN poppler-0.5.4-orig/utils/Makefile.am poppler-0.5.4/utils/Makefile.am
  78. --- poppler-0.5.4-orig/utils/Makefile.am 2006-04-12 00:25:41.000000000 +0200
  79. +++ poppler-0.5.4/utils/Makefile.am 2006-09-25 15:00:46.000000000 +0200
  80. @@ -14,11 +14,13 @@
  81. -I$(top_srcdir) \
  82. -I$(top_srcdir)/utils \
  83. -I$(top_srcdir)/poppler \
  84. - $(UTILS_CFLAGS)
  85. + $(UTILS_CFLAGS) \
  86. + $(FONTCONFIG_CFLAGS)
  87. LDADD = \
  88. $(top_builddir)/poppler/libpoppler.la \
  89. - $(UTILS_LIBS)
  90. + $(UTILS_LIBS) \
  91. + $(FONTCONFIG_LIBS)
  92. bin_PROGRAMS = \
  93. pdffonts \