Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22566
Modified Files:
poppler-qt3.info poppler-qt3.patch poppler2-qt3.info
poppler2-qt3.patch
Log Message:
misc build-recipe cleanups and syncing
Index: poppler-qt3.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler-qt3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- poppler-qt3.patch 16 Jul 2008 03:01:38 -0000 1.1
+++ poppler-qt3.patch 14 Mar 2013 17:14:19 -0000 1.2
@@ -1,6 +1,6 @@
-
---- poppler-0.5.3/configure 2006-05-31 00:57:38.000000000 -0400
-+++ poppler-0.5.3-new/configure 2006-06-01 11:21:02.000000000 -0400
+diff -Nurd -x'*~' poppler-0.5.4.orig/configure poppler-0.5.4/configure
+--- poppler-0.5.4.orig/configure 2006-09-21 20:54:32.000000000 -0400
++++ poppler-0.5.4/configure 2013-03-14 12:56:48.000000000 -0400
@@ -24268,7 +24268,7 @@
fi
@@ -10,26 +10,9 @@
jpeg_incdir=NO
for i in $jpeg_incdirs;
-@@ -24986,7 +24986,7 @@
- fi
-
- POPPLER_QT_CXXFLAGS="-I$qt_incdir"
-- POPPLER_QT_LIBS="$qtpthread $qt_libdir/$qt_test_library"
-+ POPPLER_QT_LIBS="-L$qt_libdir -lqt-mt"
- :
- else
- { { echo "$as_me:$LINENO: error: Qt development libraries not found
-@@ -25174,7 +25174,7 @@
- fi
-
- POPPLER_QT_CXXFLAGS="-I$qt_incdir"
-- POPPLER_QT_LIBS="$qtpthread $qt_libdir/$qt_test_library"
-+ POPPLER_QT_LIBS="-L$qt_libdir -lqt-mt"
- enable_poppler_qt="yes"
- else
- enable_poppler_qt="no"
---- poppler-0.5.3/qt/Makefile.in 2006-05-31 00:57:31.000000000 -0400
-+++ poppler-0.5.3-new/qt/Makefile.in 2006-06-01 11:17:35.000000000 -0400
+diff -Nurd -x'*~' poppler-0.5.4.orig/qt/Makefile.in
poppler-0.5.4/qt/Makefile.in
+--- poppler-0.5.4.orig/qt/Makefile.in 2006-09-21 20:54:24.000000000 -0400
++++ poppler-0.5.4/qt/Makefile.in 2013-03-14 12:56:48.000000000 -0400
@@ -63,7 +63,7 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -38,7 +21,7 @@
+libpoppler_qt_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
- poppler-page.lo poppler-page-transition.lo
+ poppler-link.lo poppler-page.lo poppler-page-transition.lo
@@ -71,7 +71,7 @@
PROGRAMS = $(noinst_PROGRAMS)
am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
@@ -48,21 +31,21 @@
libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -278,7 +278,7 @@
+@@ -281,7 +281,7 @@
poppler-private.h
libpoppler_qt_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
-+ -L$(prefix)/lib -lpoppler \
++ -lpoppler \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS)
-@@ -287,7 +287,7 @@
+@@ -290,7 +290,7 @@
test-poppler-qt.cpp
test_poppler_qt_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
-+ -L$(prefix)/lib -lpoppler \
++ -lpoppler \
libpoppler-qt.la \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS)
Index: poppler-qt3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler-qt3.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- poppler-qt3.info 6 Mar 2013 08:47:39 -0000 1.3
+++ poppler-qt3.info 14 Mar 2013 17:14:19 -0000 1.4
@@ -25,8 +25,11 @@
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 053fdfd70533ecce1a06353fa945f061
PatchFile: %n.patch
-PatchFile-MD5: c76672b54d186c6a33587029bd23ccd8
-PatchScript: sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 --fuzz=4
+PatchFile-MD5: f825ee9d63e5f1b53221b0a41c743145
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's,libqt-mt.so,libqt-mt.dylib,g' configure
+<<
SetCFLAGS: -Os
SetCXXFLAGS: -Os
@@ -65,7 +68,7 @@
<<
DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
SplitOff: <<
- Package: %n-shlibs
+ Package: %N-shlibs
Depends: <<
poppler1-shlibs (>= %v-1001),
freetype219-shlibs (>= 2.4.11-1),
Index: poppler2-qt3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler2-qt3.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- poppler2-qt3.info 6 Mar 2013 08:47:39 -0000 1.4
+++ poppler2-qt3.info 14 Mar 2013 17:14:19 -0000 1.5
@@ -8,7 +8,7 @@
Depends: %N-shlibs (>= %v-%r)
BuildDepends: <<
- fink (>= 0.24.12),
+ fink (>= 0.28.0-1),
fink-package-precedence,
fontconfig2-dev (>= 2.10.0-1),
freetype219 (>= 2.4.11-1),
@@ -26,9 +26,9 @@
Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
Source-MD5: 13d12ca4e349574cfbbcf4a9b2b3ae52
PatchFile: %n.patch
-PatchFile-MD5: 0b1ffa1670927166848a1e85e12e0707
+PatchFile-MD5: 930cc8ea85e105834dd9f14d67d7c92e
PatchScript: <<
- sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p1 --fuzz=4
+ %{default_script}
perl -pi -e 's,libqt-mt.so,libqt-mt.dylib,g' configure
<<
Index: poppler2-qt3.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/poppler2-qt3.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- poppler2-qt3.patch 6 Mar 2013 08:47:39 -0000 1.2
+++ poppler2-qt3.patch 14 Mar 2013 17:14:19 -0000 1.3
@@ -1,7 +1,7 @@
-
---- poppler-0.6/qt/Makefile.in 2007-09-03 14:55:21.000000000 -0400
-+++ poppler-0.6-new/qt/Makefile.in 2007-09-26 14:32:05.000000000 -0400
-@@ -63,7 +63,7 @@
+diff -Nurd -x'*~' poppler-0.10.7.orig/qt/Makefile.in
poppler-0.10.7/qt/Makefile.in
+--- poppler-0.10.7.orig/qt/Makefile.in 2009-05-16 11:40:50.000000000 -0400
++++ poppler-0.10.7/qt/Makefile.in 2013-03-14 12:53:39.000000000 -0400
+@@ -62,7 +62,7 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
@@ -10,30 +10,30 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \
-@@ -72,7 +72,7 @@
+@@ -74,7 +74,7 @@
PROGRAMS = $(noinst_PROGRAMS)
am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT)
test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS)
-test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \
+test_poppler_qt_DEPENDENCIES = \
libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler
depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -288,7 +288,7 @@
+@@ -294,7 +294,7 @@
poppler-private.h
libpoppler_qt_la_LIBADD = \
- $(top_builddir)/poppler/libpoppler.la \
-+ -L$(prefix)/lib -lpoppler \
++ -lpoppler \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS)
-@@ -298,7 +298,7 @@
+@@ -304,7 +304,7 @@
test-poppler-qt.cpp
test_poppler_qt_LDADD = \
- $(top_builddir)/poppler/libpoppler.la \
-+ -L$(prefix)/lib -lpoppler \
++ -lpoppler \
libpoppler-qt.la \
$(POPPLER_QT_LIBS) \
$(FREETYPE_LIBS)
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
