File project.diff of Package mingw32-poppler

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package mingw32-poppler (Revision acdf9c8bc140cb582abadb193be55e22)

Currently displaying revision acdf9c8bc140cb582abadb193be55e22 , Show latest

--- mingw32-poppler.spec.orig
+++ mingw32-poppler.spec
@@ -29,7 +29,22 @@ License:        GPL-2.0
 Group:          Productivity/Publishing/PDF
 Url:            http://poppler.freedesktop.org/
 Source:         http://poppler.freedesktop.org/poppler-%{version}.tar.xz
+
+# Wixlibs, MSI's
+Patch1000:      poppler-0.22.0-wix.patch
+
+# https://bugs.freedesktop.org/show_bug.cgi?id=28897
+# (upstream has reject this patch claiming it does not fix, but only hides the issue)
+Patch1001:      0001-qt4-Prevent-warnings-on-not-handled-enumeration-valu.patch
+
+# https://bugs.freedesktop.org/show_bug.cgi?id=57807
+# (upstream prefers another solution, but has not fixed it yet)
+Patch1002:      0001-Fix-warning-on-deprecated-Poppler-Annotation-window.patch
+
 #!BuildIgnore: post-build-checks
+
+BuildRequires:  wixwine uuid-runtime mingw32-gcc-wixlibs
+BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-cairo-devel
 BuildRequires:  mingw32-cross-binutils
 BuildRequires:  mingw32-cross-gcc
@@ -52,6 +67,7 @@ BuildRequires:  mingw32-libtiff-devel
 BuildRequires:  mingw32-libxml2-devel
 BuildRequires:  mingw32-win_iconv-devel
 BuildRequires:  mingw32-zlib-devel
+BuildRequires:  automake autoconf libtool
 BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %_mingw32_package_header_debug
@@ -140,12 +156,47 @@ Group:          Development/Libraries/C
 %description -n mingw32-libpoppler-qt5-devel
 Poppler is a PDF rendering library based on the xpdf-3.0 code base. (qt5 bindings development files)
 
+%package msi
+Summary:        Poppler Windows Installer
+Group:          Development/Libraries
+
+%description msi
+Poppler is a fork of the xpdf PDF viewer developed by Derek Noonburg of
+Glyph and Cog, LLC.  The purpose of forking xpdf is twofold. First, we
+want to provide PDF rendering functionality as a shared library, to
+centralize the maintenence effort. Today a number of applications
+incorporate the xpdf code base, and whenever a security issue is
+discovered, all these applications exchange patches and put out new
+releases.  In turn, all distributions must package and release new
+version of these xpdf based viewers.  It's safe to say that there's a
+lot of duplicated effort with the current situation.  Even if poppler
+in the short term introduces yet another xpdf derived code base to the
+world, we hope that over time these applications will adopt poppler.
+After all, we only need one application to use poppler to break even.
+
+Second, we would like to move libpoppler forward in a number of areas
+that doesn't fit within the goals of xpdf.  By design, xpdf depends on
+very few libraries and runs a wide range of X based platforms. This is
+a strong feature and reasonable design goal.  However, with poppler we
+would like to replace parts of xpdf that are now available as standard
+components of modern Unix desktop environments.  One such example is
+fontconfig, which solves the problem of matching and locating fonts on
+the system, in a standardized and well understood way. Another example
+is cairo, which provides high quality 2D rendering.  See the file TODO
+for a list of planned changes.
+
 %_mingw32_debug_package
 
 %prep
 %setup -q -n poppler-%{version}
 
+%patch1000 -p1
+%patch1001 -p1
+%patch1002 -p1
+
 %build
+autoreconf -f -i
+
 echo "lt_cv_deplibs_check_method='pass_all'" >>%{_mingw32_cache}
 
 # We always do this in the windows:mingw project
@@ -161,12 +212,16 @@ configure_args+=" GLIB_MKENUMS=%{_mingw3
 # Configure
 %{_mingw32_configure} ${configure_args}
 
-# Build
 make %{?_smp_mflags} || make
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
+mkdir -p %{buildroot}%{_mingw32_datadir}/msi
+mingw_arch=`echo %{_mingw32_target} | sed 's/$[^-]*$-.*$/\1/g'`
+cp poppler.msi %{buildroot}%{_mingw32_datadir}/msi/poppler-%{version}-${mingw_arch}.msi
+
+
 %files tools
 %defattr(-,root,root)
 %{_mingw32_bindir}/pdfdetach.exe
@@ -213,6 +268,7 @@ make DESTDIR=%{buildroot} install %{?_sm
 %{_mingw32_libdir}/pkgconfig/poppler.pc
 %{_mingw32_libdir}/pkgconfig/poppler-cpp.pc
 %{_mingw32_datadir}/gtk-doc/html/poppler
+%{_mingw32_datadir}/wixlib/poppler.wixlib
 
 %files -n mingw32-libpoppler-glib8
 %defattr(-,root,root)
@@ -223,6 +279,7 @@ make DESTDIR=%{buildroot} install %{?_sm
 %{_mingw32_includedir}/poppler/glib
 %{_mingw32_libdir}/libpoppler-glib.dll.a
 %{_mingw32_libdir}/pkgconfig/poppler-glib.pc
+%{_mingw32_datadir}/wixlib/poppler-glib.wixlib
 
 %files -n mingw32-libpoppler-qt4-%{poppler_qt4_soname}
 %defattr(-,root,root)
@@ -233,6 +290,12 @@ make DESTDIR=%{buildroot} install %{?_sm
 %{_mingw32_includedir}/poppler/qt4
 %{_mingw32_libdir}/libpoppler-qt4.dll.a
 %{_mingw32_libdir}/pkgconfig/poppler-qt4.pc
+%{_mingw32_datadir}/wixlib/poppler-qt4.wixlib
+
+
+%files msi
+%defattr(-,root,root)
+%{_mingw32_datadir}/msi/poppler-%{version}-*.msi
 
 %files -n mingw32-libpoppler-qt5-%{poppler_qt5_soname}
 %defattr(-,root,root)

Places

File project.diff of Package mingw32-poppler (Revision acdf9c8bc140cb582abadb193be55e22)

Places