File poppler-0.18.0-wix.patch of Package mingw32-poppler

Overview Repositories Revisions Requests Users Attributes Meta

File poppler-0.18.0-wix.patch of Package mingw32-poppler (Revision f68f546e1d5297afa5cfde7de6d0b00d)

Currently displaying revision f68f546e1d5297afa5cfde7de6d0b00d , Show latest

diff -Naur poppler-0.18.0/configure.ac poppler-0.18.0.new/configure.ac
--- poppler-0.18.0/configure.ac	2011-09-27 00:19:58.000000000 +0200
+++ poppler-0.18.0.new/configure.ac	2011-10-04 17:43:30.341863636 +0200
@@ -261,6 +261,7 @@
   AC_DEFINE(ENABLE_LIBCURL, 1, [Build against libcurl.])
   AC_DEFINE(POPPLER_HAS_CURL_SUPPORT, 1,
      [Support for curl based doc builder is compiled in.])
+  poppler_requires="$poppler_requires libcurl"
 fi
 
 AM_CONDITIONAL(BUILD_LIBCURL, test x$enable_libcurl = xyes)
@@ -273,6 +274,7 @@
               enable_libjpeg="try")
 if test x$enable_libjpeg != xno; then
   POPPLER_FIND_JPEG
+  poppler_requires="$poppler_requires libjpeg"
 fi
 
 AM_CONDITIONAL(BUILD_LIBJPEG, test x$enable_libjpeg = xyes)
@@ -293,6 +295,7 @@
 
 if test x$enable_libpng = xyes; then
   AC_DEFINE(ENABLE_LIBPNG, 1, [Build against libpng.])
+  poppler_requires="$poppler_requires libpng"
 fi
 
 AM_CONDITIONAL(BUILD_LIBPNG, test x$enable_libpng = xyes)
@@ -307,6 +310,7 @@
 if test "x$freetype_pkgconfig" = "xyes"; then
 
   AC_DEFINE(HAVE_FREETYPE_H, 1, [Have FreeType2 include files])
+  poppler_requires="$poppler_requires freetype2"
 
 else
 
@@ -351,6 +355,7 @@
      AC_DEFINE([WITH_FONTCONFIGURATION_FONTCONFIG],
                [1],[Use fontconfig font configuration backend])
      PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.0.0)
+     poppler_requires="$poppler_requires fontconfig >= 2.0.0"
      ;;
   *)
      AC_MSG_ERROR(
@@ -396,6 +401,7 @@
   CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1"
   CAIRO_REQ="cairo"
   AC_CHECK_HEADERS(fcntl.h sys/mman.h sys/stat.h)
+  poppler_requires="$poppler_requires cairo >= $CAIRO_VERSION"
 else
   CAIRO_FEATURE="#undef POPPLER_HAS_CAIRO"
   CAIRO_REQ=""
@@ -429,6 +435,7 @@
     AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
     POPPLER_GLIB_DISABLE_DEPRECATED="$POPPLER_GLIB_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
     POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="$POPPLER_GLIB_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES"
+    poppler_requires="$poppler_requires $GLIB_REQ"
   fi
 else
   if test x$enable_poppler_glib = xyes; then
@@ -494,6 +501,7 @@
   fi
   AC_SUBST(MOCQT4)
   AC_MSG_RESULT([$MOCQT4])
+  poppler_requires="$poppler_requires QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0"
 fi
 
 AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
@@ -529,6 +537,9 @@
                     [enable_gtk_test="yes"],
                     [enable_gtk_test="no"])
 fi
+if test x$enable_gtk_test = xyes; then
+  poppler_requires="$poppler_requires gtk+-2.0 >= 2.14 gdk-pixbuf-2.0 gthread-2.0 gio-2.0"
+fi
 AM_CONDITIONAL(BUILD_GTK_TEST, test x$enable_gtk_test = xyes -a x$enable_poppler_glib = xyes)
 
 AC_ARG_ENABLE(utils,
@@ -560,6 +571,7 @@
 
 if test "x$enable_cms" = "xyes"; then
   AC_DEFINE(USE_CMS, 1, [Defines if use cms])
+  poppler_requires="$poppler_requires lcms"
 fi
 AM_CONDITIONAL(USE_CMS, test x$enable_cms = xyes)
 
@@ -594,6 +606,13 @@
 AC_SUBST([POPPLER_MICRO_VERSION],[poppler_version_micro])
 AC_SUBST([POPPLER_VERSION],[poppler_version])
 
+WIX_INIT()
+if test "x$enable_wix" = "xyes"; then
+   WIX_PKG_CHECK_MODULES(POPPLER, $poppler_requires libstdcxx libgcc)
+fi
+AC_SUBST(POPPLER_WIXLIBS)
+AC_SUBST(POPPLER_FUAL_FLAGS)
+
 AC_OUTPUT([
 Makefile
 goo/Makefile
diff -Naur poppler-0.18.0/Makefile.am poppler-0.18.0.new/Makefile.am
--- poppler-0.18.0/Makefile.am	2011-09-18 18:17:01.000000000 +0200
+++ poppler-0.18.0.new/Makefile.am	2011-10-04 17:43:30.341863636 +0200
@@ -116,3 +116,55 @@
 
 .PHONY: ChangeLog
 
+EXTRA_DIST +=			\
+	poppler.wxs		\
+	poppler-glib.wxs	\
+	poppler-qt4.wxs
+
+if ENABLE_WIX
+
+wixlibdir = ${datadir}/wixlib
+wixlib_WIX = poppler.wixlib poppler-glib.wixlib poppler-qt4.wixlib
+
+poppler.wixlib: wixdistdir
+poppler-glib.wixlib: wixdistdir
+poppler-qt4.wixlib: wixdistdir
+
+all-am: poppler-pc-stamp
+poppler-pc-stamp: poppler.pc
+	echo 'Requires.private: freetype2 libjpeg lcms libpng libxml-2.0 zlib libstdcxx libgcc' >> poppler.pc
+	echo 'Wixlibs=${wixlibdir}/poppler.wixlib' >> poppler.pc
+	echo 'Fualflags=-C poppler -D poppler' >> poppler.pc
+	touch \$(@)
+
+all-am: poppler-glib-pc-stamp
+poppler-glib-pc-stamp: poppler-glib.pc
+	echo 'Wixlibs=${wixlibdir}/poppler-glib.wixlib' >> poppler-glib.pc
+	echo 'Fualflags=-C poppler_glib -D poppler_glib' >> poppler-glib.pc
+	touch \$(@)
+
+all-am: poppler-qt4-pc-stamp
+poppler-qt4-pc-stamp: poppler-qt4.pc
+	echo 'Wixlibs=${wixlibdir}/poppler-qt4.wixlib' >> poppler-qt4.pc
+	echo 'Fualflags=-C poppler_qt4 -D poppler_qt4' >> poppler-qt4.pc
+	touch \$(@)
+
+poppler-package.wxs: wixdistdir
+	$(HEAT) dir $(wixdistdir) $(HEAT_FLAGS) -gg -sfrag -sreg -cg poppler_package -dr poppler_package -srd -var var.wixdistdir -o $(@)
+
+#copy_demo_programs_stamp: wixdistdir
+#	cp glib/.libs/test-poppler-glib.exe $(wixdistdir)/bin
+#	cp qt4/demos/.libs/poppler_qt4viewer.exe $(wixdistdir)/bin
+
+poppler.msi.wxs:
+	$(FUAL) -o $(@) -p Poppler-$(VERSION) -C poppler_package -D poppler_package $(POPPLER_FUAL_FLAGS)
+
+noinst_msi_WIX =			\
+    poppler.msi
+
+@WIX_MAKE_RULES@
+
+poppler.msi: poppler.msi.wixobj poppler-package.wixobj
+	$(LIGHT) -ext WixUIExtension poppler.msi.wixobj poppler-package.wixobj $(POPPLER_WIXLIBS) -o $(@) -sval
+
+endif
diff -Naur poppler-0.18.0/poppler-glib.wxs poppler-0.18.0.new/poppler-glib.wxs
--- poppler-0.18.0/poppler-glib.wxs	1970-01-01 01:00:00.000000000 +0100
+++ poppler-0.18.0.new/poppler-glib.wxs	2011-10-04 17:43:30.345863674 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <ComponentGroup Id="poppler_glib">
+            <ComponentRef Id="cmp0555FFCF0DADEC44C08C52A415F2F11B" />
+        </ComponentGroup>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="poppler_glib">
+            <Directory Id="dir8CF2A83C36D0A908F17CCAA28869C8D8" Name="bin">
+                <Component Id="cmp0555FFCF0DADEC44C08C52A415F2F11B" Guid="{A60E019B-8726-4CB7-A551-55F62F5025AF}">
+                    <File Id="fil6DC1E5C255C363378E4E00FBF00CEC5D" KeyPath="yes" Source="$(var.wixdistdir)\bin\libpoppler-glib-8.dll" />
+                </Component>
+            </Directory>
+        </DirectoryRef>
+    </Fragment>
+</Wix>
diff -Naur poppler-0.18.0/poppler-qt4.wxs poppler-0.18.0.new/poppler-qt4.wxs
--- poppler-0.18.0/poppler-qt4.wxs	1970-01-01 01:00:00.000000000 +0100
+++ poppler-0.18.0.new/poppler-qt4.wxs	2011-10-04 17:43:30.345863674 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <ComponentGroup Id="poppler_qt4">
+            <ComponentRef Id="cmp369E52086628D3EA759143F752AFC76D" />
+        </ComponentGroup>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="poppler_qt4">
+            <Directory Id="dir06BCD53B48E91D5C98136340248022A2" Name="bin">
+                <Component Id="cmp369E52086628D3EA759143F752AFC76D" Guid="{33FC8D60-C27C-4A0C-B943-B2A4939101BD}">
+                   <File Id="fil517EEFFCDDCFD1D1C8F081A49EEED64A" KeyPath="yes" Source="$(var.wixdistdir)\bin\libpoppler-qt4-3.dll" />
+               </Component>
+            </Directory>
+        </DirectoryRef>
+    </Fragment>
+</Wix>
diff -Naur poppler-0.18.0/poppler.wxs poppler-0.18.0.new/poppler.wxs
--- poppler-0.18.0/poppler.wxs	1970-01-01 01:00:00.000000000 +0100
+++ poppler-0.18.0.new/poppler.wxs	2011-10-04 17:43:30.345863674 +0200
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+    <Fragment>
+        <ComponentGroup Id="poppler">
+            <ComponentRef Id="cmp7188DE409C993B815E46122E6495F3DA" />
+            <ComponentRef Id="cmp6114C427DE314F3DADDEBDB1983563A9" />
+            <ComponentRef Id="cmp1DC380992EBB4DCF86A9075922EEF1D9" />
+            <ComponentRef Id="cmp24B0E1F1FCD141E7A166E403BBE19F6C" />
+            <ComponentRef Id="cmp78D676E4683441A684E2302706115B9F" />
+        </ComponentGroup>
+    </Fragment>
+    <Fragment>
+        <DirectoryRef Id="poppler">
+            <Directory Id="dir72F2A83C36D0A908F17CCAA28869C8D8" Name="bin">
+                <Component Id="cmp7188DE409C993B815E46122E6495F3DA" Guid="{B8C9D89E-B9D0-4AFC-8784-529E7D466B8A}">
+                    <File Id="fil6D7EC42B28A8F787B1C821326FF8BA52" KeyPath="yes" Source="$(var.wixdistdir)\bin\libpoppler-19.dll" />
+                </Component>
+            </Directory>
+            <Directory Id="dirC8775DE729A345F393683B02408E4924" Name="share">
+                <Directory Id="dir81424CB395404266BAC9E241F3705F6D" Name="license">
+                    <Directory Id="dirFBDD40E12BB14E2586201453B86CB2D8" Name="poppler">
+                        <Component Id="cmp6114C427DE314F3DADDEBDB1983563A9" Guid="{EB3254E7-6E9A-4A27-88E5-1B17DE577427}">
+                            <File Id="fil4531B6FC8BB84B9F96EE0E74614A00B3" KeyPath="yes" Source="AUTHORS" />
+                        </Component>
+                        <Component Id="cmp1DC380992EBB4DCF86A9075922EEF1D9" Guid="{87CEAEA1-A004-4E56-A998-B5ED47480AED}">
+                            <File Id="fil4AA85BFBA3334B20878630684A7F028D" KeyPath="yes" Source="COPYING" />
+                        </Component>
+                        <Component Id="cmp24B0E1F1FCD141E7A166E403BBE19F6C" Guid="{7D4D505B-5D39-4DB5-A1E4-1DAEDC4924D3}">
+                            <File Id="fil2D7CC7D46D794E47946C8C372211CFCD" KeyPath="yes" Source="README" />
+                        </Component>
+                        <Component Id="cmp78D676E4683441A684E2302706115B9F" Guid="{1D451096-6E65-4387-8D6B-0B0B42E3609D}">
+                            <File Id="fil937A134CF4504C2292C7CBF9F9FDCF90" KeyPath="yes" Source="README-XPDF" />
+                        </Component>
+                    </Directory>
+                </Directory>
+            </Directory>
+        </DirectoryRef>
+    </Fragment>
+</Wix>

Places

File poppler-0.18.0-wix.patch of Package mingw32-poppler (Revision f68f546e1d5297afa5cfde7de6d0b00d)

Places