Author: ranger Date: Sun Jun 7 05:42:23 2009 New Revision: 1565 URL: <http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1565&repname=user%3a+ranger> Log: more updates
Added: trunk/experimental/10.4/crypto/finkinfo/kdegraphics4.patch trunk/experimental/10.4/main/finkinfo/libs/poppler4.patch trunk/experimental/common/crypto/finkinfo/kdegraphics4.patch Modified: trunk/experimental/ (props changed) trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-mac.info trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-x11.info trunk/experimental/10.4/main/finkinfo/devel/kde4-buildenv.info trunk/experimental/common/crypto/finkinfo/kdegraphics4.info.in trunk/experimental/common/crypto/finkinfo/qca2.info trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info Propchange: trunk/experimental/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun Jun 7 05:42:23 2009 @@ -1,2 +1,3 @@ ChangeLog* .*.swp +svn-commit.tmp Modified: trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-mac.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-mac.info&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-mac.info (original) +++ trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-mac.info Sun Jun 7 05:42:23 2009 @@ -54,6 +54,8 @@ Source: mirror:kde:stable/%v/src/kdegraphics-%v.tar.bz2 Source-MD5: 34d7cf506dea9ab4dc78e9901c96391e +PatchFile: kdegraphics4.patch +PatchFile-MD5: df513008247ac28a210e22554b30627e CompileScript: << #!/bin/sh -ev Modified: trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-x11.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-x11.info&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-x11.info (original) +++ trunk/experimental/10.4/crypto/finkinfo/kdegraphics4-x11.info Sun Jun 7 05:42:23 2009 @@ -56,6 +56,8 @@ Source: mirror:kde:stable/%v/src/kdegraphics-%v.tar.bz2 Source-MD5: 34d7cf506dea9ab4dc78e9901c96391e +PatchFile: kdegraphics4.patch +PatchFile-MD5: df513008247ac28a210e22554b30627e CompileScript: << #!/bin/sh -ev Added: trunk/experimental/10.4/crypto/finkinfo/kdegraphics4.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/crypto/finkinfo/kdegraphics4.patch&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/crypto/finkinfo/kdegraphics4.patch (added) +++ trunk/experimental/10.4/crypto/finkinfo/kdegraphics4.patch Sun Jun 7 05:42:23 2009 @@ -1,0 +1,11 @@ +diff -Nurd kdegraphics-4.2.4/gwenview/lib/CMakeLists.txt kdegraphics-4.2.4-new/gwenview/lib/CMakeLists.txt +--- kdegraphics-4.2.4/gwenview/lib/CMakeLists.txt 2009-01-01 11:24:41.000000000 -0500 ++++ kdegraphics-4.2.4-new/gwenview/lib/CMakeLists.txt 2009-06-06 23:30:19.000000000 -0400 +@@ -4,6 +4,7 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR} ++ ${SOPRANO_INCLUDE_DIR} + ${EXIV2_INCLUDE_DIR} + ) + Modified: trunk/experimental/10.4/main/finkinfo/devel/kde4-buildenv.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/devel/kde4-buildenv.info&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/devel/kde4-buildenv.info (original) +++ trunk/experimental/10.4/main/finkinfo/devel/kde4-buildenv.info Sun Jun 7 05:42:23 2009 @@ -16,7 +16,7 @@ << NoSourceDirectory: true Source: mirror:custom:%n/%n-%v-%r.sh -Source-MD5: ce2ca86acd6a59b920652859d6ed4f01 +Source-MD5: 241d2be639148da03dc255138c4566b9 Source2: mirror:custom:%n/normalize-filenames-%v-%r.sh Source2-MD5: aa5d58694004df09f486abc9907f7e0a Added: trunk/experimental/10.4/main/finkinfo/libs/poppler4.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/10.4/main/finkinfo/libs/poppler4.patch&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/10.4/main/finkinfo/libs/poppler4.patch (added) +++ trunk/experimental/10.4/main/finkinfo/libs/poppler4.patch Sun Jun 7 05:42:23 2009 @@ -1,0 +1,452 @@ +diff -Nurd poppler-0.10.5/configure poppler-0.10.5-new/configure +--- poppler-0.10.5/configure 2009-03-11 19:15:52.000000000 -0400 ++++ poppler-0.10.5-new/configure 2009-04-15 22:27:52.000000000 -0400 +@@ -23367,7 +23367,7 @@ + + qt_test_include="qstyle.h" + qt_test_la_library="libqt-mt.la" +-qt_test_library="libqt-mt.so" ++qt_test_library="libqt-mt.dylib" + + { echo "$as_me:$LINENO: checking for Qt headers" >&5 + echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6; } +@@ -23558,7 +23558,7 @@ + + qt_test_include="qstyle.h" + qt_test_la_library="libqt-mt.la" +-qt_test_library="libqt-mt.so" ++qt_test_library="libqt-mt.dylib" + + { echo "$as_me:$LINENO: checking for Qt headers" >&5 + echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6; } +diff -Nurd poppler-0.10.5/glib/Makefile.in poppler-0.10.5-new/glib/Makefile.in +--- poppler-0.10.5/glib/Makefile.in 2009-03-11 19:15:52.000000000 -0400 ++++ poppler-0.10.5-new/glib/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -65,7 +65,7 @@ + @build_cairo_output_t...@am__dependencies_2 = $(top_builddir)/poppler/libpoppler-cairo.la \ + @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) + libpoppler_glib_la_DEPENDENCIES = \ +- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) + am__objects_1 = poppler-enums.lo +@@ -82,7 +82,6 @@ + @BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT) + test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS) + @build_with_gdk_t...@test_poppler_glib_dependencies = \ +...@build_with_gdk_true@ $(top_builddir)/poppler/libpoppler.la \ + @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ + @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ + @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -301,11 +300,11 @@ + -DG_LOG_DOMAIN=\"Poppler\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/poppler \ ++ $(FREETYPE_CFLAGS) \ ++ $(FONTCONFIG_CFLAGS) \ + $(cairo_includes) \ + $(POPPLER_GLIB_CFLAGS) \ + $(GDK_CFLAGS) \ +- $(FREETYPE_CFLAGS) \ +- $(FONTCONFIG_CFLAGS) \ + $(cairo_includes) + + stamp_files = stamp-poppler-enums.h +@@ -337,11 +336,11 @@ + poppler-private.h + + libpoppler_glib_la_LIBADD = \ +- $(top_builddir)/poppler/libpoppler.la \ +- $(POPPLER_GLIB_LIBS) \ +- $(GDK_LIBS) \ ++ -lpoppler \ + $(FREETYPE_LIBS) \ + $(FONTCONFIG_LIBS) \ ++ $(POPPLER_GLIB_LIBS) \ ++ $(GDK_LIBS) \ + $(cairo_libs) + + libpoppler_glib_la_LDFLAGS = -version-info 4:0:0 @create_shared_lib@ +@@ -349,11 +348,11 @@ + @BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc + + @build_with_gdk_t...@test_poppler_glib_ldadd = \ +...@build_with_gdk_true@ $(top_builddir)/poppler/libpoppler.la \ +...@build_with_gdk_true@ -lpoppler \ + @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la \ +...@build_with_gdk_true@ $(FREETYPE_LIBS) \ + @BUILD_WITH_GDK_TRUE@ $(POPPLER_GLIB_LIBS) \ + @BUILD_WITH_GDK_TRUE@ $(GDK_LIBS) \ +...@build_with_gdk_true@ $(FREETYPE_LIBS) \ + @BUILD_WITH_GDK_TRUE@ $(cairo_libs) + + BUILT_SOURCES = \ +diff -Nurd poppler-0.10.5/glib/demo/Makefile.in poppler-0.10.5-new/glib/demo/Makefile.in +--- poppler-0.10.5/glib/demo/Makefile.in 2009-03-11 19:15:53.000000000 -0400 ++++ poppler-0.10.5-new/glib/demo/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -59,7 +59,7 @@ + am__DEPENDENCIES_1 = + poppler_glib_demo_DEPENDENCIES = \ + $(top_builddir)/glib/libpoppler-glib.la \ +- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) ++ $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -...@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -283,7 +283,7 @@ + + LDADD = \ + $(top_builddir)/glib/libpoppler-glib.la \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(GTK_TEST_LIBS) + + all: all-am +diff -Nurd poppler-0.10.5/glib/reference/Makefile.in poppler-0.10.5-new/glib/reference/Makefile.in +--- poppler-0.10.5/glib/reference/Makefile.in 2009-03-11 19:15:53.000000000 -0400 ++++ poppler-0.10.5-new/glib/reference/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -288,15 +288,15 @@ + # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) + # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) + INCLUDES = -I$(top_srcdir)/glib -I$(top_builddir)/glib \ ++ $(FREETYPE_CFLAGS) \ + $(CAIRO_CFLAGS) \ + $(POPPLER_GLIB_CFLAGS) \ +- $(GDK_CFLAGS) \ +- $(FREETYPE_CFLAGS) ++ $(GDK_CFLAGS) + +-GTKDOC_LIBS = $(top_builddir)/poppler/libpoppler.la \ ++GTKDOC_LIBS = -lpoppler \ + $(top_builddir)/glib/libpoppler-glib.la \ +- $(POPPLER_GLIB_LIBS) \ + $(FREETYPE_LIBS) \ ++ $(POPPLER_GLIB_LIBS) \ + $(cairo_libs) + + @gtk_doc_use_libtool_fa...@gtkdoc_cc = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +diff -Nurd poppler-0.10.5/poppler/Makefile.in poppler-0.10.5-new/poppler/Makefile.in +--- poppler-0.10.5/poppler/Makefile.in 2009-03-11 19:15:53.000000000 -0400 ++++ poppler-0.10.5-new/poppler/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -407,12 +407,12 @@ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/goo \ ++ $(FREETYPE_CFLAGS) \ ++ $(FONTCONFIG_CFLAGS) \ + $(splash_includes) \ + $(cairo_includes) \ + $(arthur_includes) \ +- $(abiword_includes) \ +- $(FREETYPE_CFLAGS) \ +- $(FONTCONFIG_CFLAGS) ++ $(abiword_includes) + + lib_LTLIBRARIES = libpoppler.la + noinst_LTLIBRARIES = $(poppler_cairo) \ +@@ -421,13 +421,13 @@ + libpoppler_la_LIBADD = \ + $(top_builddir)/goo/libgoo.la \ + $(top_builddir)/fofi/libfofi.la \ ++ $(FREETYPE_LIBS) \ ++ $(FONTCONFIG_LIBS) \ + $(splash_libs) \ + $(libjpeg_libs) \ + $(zlib_libs) \ + $(libjpeg2000_libs) \ + $(abiword_libs) \ +- $(FREETYPE_LIBS) \ +- $(FONTCONFIG_LIBS) \ + $(PTHREAD_LIBS) \ + $(win32_libs) + +diff -Nurd poppler-0.10.5/qt/Makefile.in poppler-0.10.5-new/qt/Makefile.in +--- poppler-0.10.5/qt/Makefile.in 2009-03-11 19:15:53.000000000 -0400 ++++ poppler-0.10.5-new/qt/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -62,7 +62,7 @@ + libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = +-libpoppler_qt_la_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ ++libpoppler_qt_la_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) + am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \ +@@ -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 = -...@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -270,10 +270,10 @@ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/poppler \ +- $(cairo_includes) \ +- $(POPPLER_QT_CXXFLAGS) \ + $(FREETYPE_CFLAGS) \ +- $(FONTCONFIG_CFLAGS) ++ $(FONTCONFIG_CFLAGS) \ ++ $(cairo_includes) \ ++ $(POPPLER_QT_CXXFLAGS) + + poppler_includedir = $(includedir)/poppler/qt3 + poppler_include_HEADERS = \ +@@ -292,20 +292,20 @@ + poppler-private.h + + libpoppler_qt_la_LIBADD = \ +- $(top_builddir)/poppler/libpoppler.la \ +- $(POPPLER_QT_LIBS) \ ++ -lpoppler \ + $(FREETYPE_LIBS) \ +- $(FONTCONFIG_LIBS) ++ $(FONTCONFIG_LIBS) \ ++ $(POPPLER_QT_LIBS) + + libpoppler_qt_la_LDFLAGS = -version-info 2:0:0 + test_poppler_qt_SOURCES = \ + test-poppler-qt.cpp + + test_poppler_qt_LDADD = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + libpoppler-qt.la \ +- $(POPPLER_QT_LIBS) \ +- $(FREETYPE_LIBS) ++ $(FREETYPE_LIBS) \ ++ $(POPPLER_QT_LIBS) + + all: all-am + +diff -Nurd poppler-0.10.5/qt4/demos/Makefile.in poppler-0.10.5-new/qt4/demos/Makefile.in +--- poppler-0.10.5/qt4/demos/Makefile.in 2009-03-11 19:15:53.000000000 -0400 ++++ poppler-0.10.5-new/qt4/demos/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -57,7 +57,7 @@ + toc.$(OBJEXT) viewer.$(OBJEXT) + poppler_qt4viewer_OBJECTS = $(am_poppler_qt4viewer_OBJECTS) + am__DEPENDENCIES_1 = +-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \ ++am__DEPENDENCIES_2 = \ + $(top_builddir)/qt4/src/libpoppler-qt4.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + poppler_qt4viewer_DEPENDENCIES = $(am__DEPENDENCIES_2) +@@ -259,7 +259,7 @@ + $(POPPLER_QT4_CFLAGS) + + LDADDS = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(top_builddir)/qt4/src/libpoppler-qt4.la \ + $(FONTCONFIG_LIBS) \ + $(POPPLER_QT4_LIBS) +diff -Nurd poppler-0.10.5/qt4/src/Makefile.in poppler-0.10.5-new/qt4/src/Makefile.in +--- poppler-0.10.5/qt4/src/Makefile.in 2009-03-11 19:15:53.000000000 -0400 ++++ poppler-0.10.5-new/qt4/src/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -64,7 +64,7 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + libpoppler_qt4_la_DEPENDENCIES = \ +- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__append_1) + am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \ + poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \ +@@ -318,7 +318,7 @@ + poppler-export.h \ + poppler-private.h + +-libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \ ++libpoppler_qt4_la_LIBADD = -lpoppler \ + $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1) + libpoppler_qt4_la_LDFLAGS = -version-info 4:0:1 + all: all-am +diff -Nurd poppler-0.10.5/qt4/tests/Makefile.in poppler-0.10.5-new/qt4/tests/Makefile.in +--- poppler-0.10.5/qt4/tests/Makefile.in 2009-03-11 19:15:53.000000000 -0400 ++++ poppler-0.10.5-new/qt4/tests/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -80,7 +80,7 @@ + @BUILD_POPPLER_QT4_TRUE@ check_actualtext.$(OBJEXT) + check_actualtext_OBJECTS = $(am_check_actualtext_OBJECTS) + am__DEPENDENCIES_1 = +-am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler.la \ ++am__DEPENDENCIES_2 = \ + $(top_builddir)/qt4/src/libpoppler-qt4.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + @build_poppler_qt4_t...@check_actualtext_dependencies = \ +@@ -384,7 +384,7 @@ + $(POPPLER_QT4_CFLAGS) + + LDADDS = \ +- $(top_builddir)/poppler/libpoppler.la \ ++ -lpoppler \ + $(top_builddir)/qt4/src/libpoppler-qt4.la \ + $(FONTCONFIG_LIBS) \ + $(POPPLER_QT4_LIBS) +diff -Nurd poppler-0.10.5/test/Makefile.in poppler-0.10.5-new/test/Makefile.in +--- poppler-0.10.5/test/Makefile.in 2009-03-11 19:15:54.000000000 -0400 ++++ poppler-0.10.5-new/test/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -277,8 +277,8 @@ + @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_GTK_TEST_TRUE@ pdf_inspector + + @BUILD_CAIRO_OUTPUT_TRUE@@build_gtk_test_t...@cairo_includes = \ +...@build_cairo_output_true@@BUILD_GTK_TEST_TRUE@ $(CAIRO_CFLAGS) \ +...@build_cairo_output_true@@BUILD_GTK_TEST_TRUE@ $(FREETYPE_CFLAGS) +...@build_cairo_output_true@@BUILD_GTK_TEST_TRUE@ $(FREETYPE_CFLAGS) \ +...@build_cairo_output_true@@BUILD_GTK_TEST_TRUE@ $(CAIRO_CFLAGS) + + @build_splash_output_t...@perf_test = \ + @BUILD_SPLASH_OUTPUT_TRUE@ perf-test +@@ -291,9 +291,9 @@ + -I$(top_srcdir)/poppler \ + -I$(top_srcdir)/glib \ + -I$(top_builddir)/glib \ ++ $(FONTCONFIG_CFLAGS) \ + $(cairo_includes) \ +- $(GTK_TEST_CFLAGS) \ +- $(FONTCONFIG_CFLAGS) ++ $(GTK_TEST_CFLAGS) + + gtk_splash_test_SOURCES = \ + gtk-splash-test.cc +@@ -308,9 +308,9 @@ + gtk_cairo_test_LDADD = \ + $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/glib/libpoppler-glib.la \ ++ $(FONTCONFIG_LIBS) \ + $(CAIRO_LIBS) \ +- $(GTK_TEST_LIBS) \ +- $(FONTCONFIG_LIBS) ++ $(GTK_TEST_LIBS) + + pdf_inspector_SOURCES = \ + pdf-inspector.cc +@@ -318,8 +318,8 @@ + pdf_inspector_LDADD = \ + $(top_builddir)/poppler/libpoppler-cairo.la \ + $(top_builddir)/poppler/libpoppler.la \ +- $(CAIRO_LIBS) \ + $(FREETYPE_LIBS) \ ++ $(CAIRO_LIBS) \ + $(GTK_TEST_LIBS) \ + $(X_EXTRA_LIBS) + +diff -Nurd poppler-0.10.5/utils/Makefile.in poppler-0.10.5-new/utils/Makefile.in +--- poppler-0.10.5/utils/Makefile.in 2009-03-11 19:15:54.000000000 -0400 ++++ poppler-0.10.5-new/utils/Makefile.in 2009-04-15 22:27:52.000000000 -0400 +@@ -318,14 +318,14 @@ + -I$(top_srcdir) \ + -I$(top_srcdir)/utils \ + -I$(top_srcdir)/poppler \ +- $(UTILS_CFLAGS) \ + $(FONTCONFIG_CFLAGS) \ ++ $(UTILS_CFLAGS) \ + $(ABIWORD_CFLAGS) + + LDADD = \ + $(top_builddir)/poppler/libpoppler.la \ +- $(UTILS_LIBS) \ +- $(FONTCONFIG_LIBS) ++ $(FONTCONFIG_LIBS) \ ++ $(UTILS_LIBS) + + dist_man1_MANS = \ + pdffonts.1 \ +diff -Nurd poppler-0.10.5/xpdfrc.poppler4 poppler-0.10.5-new/xpdfrc.poppler4 +--- poppler-0.10.5/xpdfrc.poppler4 1969-12-31 19:00:00.000000000 -0500 ++++ poppler-0.10.5-new/xpdfrc.poppler4 2009-04-15 22:27:52.000000000 -0400 +@@ -0,0 +1,91 @@ ++#======================================================================== ++# ++# Sample xpdfrc file ++# ++# The Xpdf tools look for a config file in two places: ++# 1. ~/.xpdfrc ++# 2. in a system-wide directory, typically /usr/local/etc/xpdfrc ++# ++# This sample config file demonstrates some of the more common ++# configuration options. Everything here is commented out. You ++# should edit things (especially the file/directory paths, since ++# they'll likely be different on your system), and uncomment whichever ++# options you want to use. For complete details on config file syntax ++# and available options, please see the xpdfrc(5) man page. ++# ++# Also, the Xpdf language support packages each include a set of ++# options to be added to the xpdfrc file. ++# ++# http://www.foolabs.com/xpdf/ ++# ++#======================================================================== ++ ++#----- display fonts ++ ++# These map the Base-14 fonts to the Type 1 fonts that ship with ++# ghostscript. You'll almost certainly want to use something like ++# this, but you'll need to adjust this to point to wherever ++# ghostscript is installed on your system. (But if the fonts are ++# installed in a "standard" location, xpdf will find them ++# automatically.) ++ ++displayFontT1 Times-Roman @PREFIX@/share/ghostscript/fonts/n021003l.pfb ++displayFontT1 Times-Italic @PREFIX@/share/ghostscript/fonts/n021023l.pfb ++displayFontT1 Times-Bold @PREFIX@/share/ghostscript/fonts/n021004l.pfb ++displayFontT1 Times-BoldItalic @PREFIX@/share/ghostscript/fonts/n021024l.pfb ++displayFontT1 Helvetica @PREFIX@/share/ghostscript/fonts/n019003l.pfb ++displayFontT1 Helvetica-Oblique @PREFIX@/share/ghostscript/fonts/n019023l.pfb ++displayFontT1 Helvetica-Bold @PREFIX@/share/ghostscript/fonts/n019004l.pfb ++displayFontT1 Helvetica-BoldOblique @PREFIX@/share/ghostscript/fonts/n019024l.pfb ++displayFontT1 Courier @PREFIX@/share/ghostscript/fonts/n022003l.pfb ++displayFontT1 Courier-Oblique @PREFIX@/share/ghostscript/fonts/n022023l.pfb ++displayFontT1 Courier-Bold @PREFIX@/share/ghostscript/fonts/n022004l.pfb ++displayFontT1 Courier-BoldOblique @PREFIX@/share/ghostscript/fonts/n022024l.pfb ++displayFontT1 Symbol @PREFIX@/share/ghostscript/fonts/s050000l.pfb ++displayFontT1 ZapfDingbats @PREFIX@/share/ghostscript/fonts/d050000l.pfb ++ ++# If you need to display PDF files that refer to non-embedded fonts, ++# you should add one or more fontDir options to point to the ++# directories containing the font files. Xpdf will only look at .pfa, ++# .pfb, and .ttf files in those directories (other files will simply ++# be ignored). ++ ++fontDir /usr/local/fonts/bakoma ++ ++#----- PostScript output control ++ ++# Set the default PostScript file or command. ++ ++psFile "|lpr -Pmyprinter" ++ ++# Set the default PostScript paper size -- this can be letter, legal, ++# A4, or A3. You can also specify a paper size as width and height ++# (in points). ++ ++psPaperSize letter ++ ++#----- text output control ++ ++# Choose a text encoding for copy-and-paste and for pdftotext output. ++# The Latin1, ASCII7, and UTF-8 encodings are built into Xpdf. Other ++# encodings are available in the language support packages. ++ ++textEncoding UTF-8 ++ ++# Choose the end-of-line convention for multi-line copy-and-past and ++# for pdftotext output. The available options are unix, mac, and dos. ++ ++textEOL unix ++ ++#----- misc settings ++ ++# Enable t1lib, FreeType, and anti-aliased text. ++ ++enableT1lib yes ++enableFreeType yes ++antialias yes ++ ++# Set the command used to run a web browser when a URL hyperlink is ++# clicked. ++ ++urlCommand "open 'openURL(%s)'" Modified: trunk/experimental/common/crypto/finkinfo/kdegraphics4.info.in URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/kdegraphics4.info.in&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/crypto/finkinfo/kdegraphics4.info.in (original) +++ trunk/experimental/common/crypto/finkinfo/kdegraphics4.info.in Sun Jun 7 05:42:23 2009 @@ -14,6 +14,8 @@ Source: mirror:kde:stable/%v/src/kdegraphics-%v.tar.bz2 Source-MD5: 34d7cf506dea9ab4dc78e9901c96391e +PatchFile: kdegraphics4.patch +PatchFile-MD5: df513008247ac28a210e22554b30627e Depends: << gsthumbnail4-%type_pkg[kde] (>= %v-%r), Added: trunk/experimental/common/crypto/finkinfo/kdegraphics4.patch URL: <http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/crypto/finkinfo/kdegraphics4.patch&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/crypto/finkinfo/kdegraphics4.patch (added) +++ trunk/experimental/common/crypto/finkinfo/kdegraphics4.patch Sun Jun 7 05:42:23 2009 @@ -1,0 +1,11 @@ +diff -Nurd kdegraphics-4.2.4/gwenview/lib/CMakeLists.txt kdegraphics-4.2.4-new/gwenview/lib/CMakeLists.txt +--- kdegraphics-4.2.4/gwenview/lib/CMakeLists.txt 2009-01-01 11:24:41.000000000 -0500 ++++ kdegraphics-4.2.4-new/gwenview/lib/CMakeLists.txt 2009-06-06 23:30:19.000000000 -0400 +@@ -4,6 +4,7 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg + ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${CMAKE_CURRENT_BINARY_DIR} ++ ${SOPRANO_INCLUDE_DIR} + ${EXIV2_INCLUDE_DIR} + ) + Modified: trunk/experimental/common/crypto/finkinfo/qca2.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/qca2.info&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/crypto/finkinfo/qca2.info (original) +++ trunk/experimental/common/crypto/finkinfo/qca2.info Sun Jun 7 05:42:23 2009 @@ -31,15 +31,15 @@ QTDIR="%p/lib/qt4-%type_pkg[qca]" export PATH="$QTDIR/bin:$PATH" - ./configure --prefix="%p/opt/%type_pkg[qca]" --no-framework --release --no-separate-debug-info + ./configure --prefix="%p/opt/qca2/%type_pkg[qca]" --no-framework --release --no-separate-debug-info make << InstallScript: << #!/bin/sh -ev - make install INSTALL_ROOT="%d" - QCALIBDIR="%p/opt/%type_pkg[qca]/lib" + make -j1 install INSTALL_ROOT="%d" + QCALIBDIR="%p/opt/qca2/%type_pkg[qca]/lib" install_name_tool -id $QCALIBDIR/libqca.2.dylib "%d/$QCALIBDIR/libqca.%v.dylib" install_name_tool -change libqca.2.dylib $QCALIBDIR/libqca.2.dylib "%d/$QCALIBDIR/../bin/qcatool2" perl -pi -e 's,-lqca_debug,-lqca,g' %i/lib/qt4-%type_pkg[qca]/mkspecs/features/crypto.prf @@ -58,8 +58,8 @@ << DocFiles: COPYING Recommends: %N (>= %v-%r) - Files: opt/%type_pkg[qca]/lib/libqca.2*.dylib - Shlibs: %p/opt/%type_pkg[qca]/lib/libqca.2.dylib 2.0.0 %n (>= 2.0.1-2) + Files: opt/qca2/%type_pkg[qca]/lib/libqca.2*.dylib + Shlibs: %p/opt/qca2/%type_pkg[qca]/lib/libqca.2.dylib 2.0.0 %n (>= 2.0.2-1) << DescDetail: << Modified: trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info URL: <http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info&rev=1565&repname=user%3a+ranger> ============================================================================== --- trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info (original) +++ trunk/experimental/common/main/finkinfo/devel/kde4-buildenv.info Sun Jun 7 05:42:23 2009 @@ -10,7 +10,7 @@ nam-CA: http://www.southofheaven.net/befunk << Source: mirror:custom:%n/%n-%v-%r.sh -Source-MD5: ce2ca86acd6a59b920652859d6ed4f01 +Source-MD5: 241d2be639148da03dc255138c4566b9 Source2: mirror:custom:%n/normalize-filenames-%v-%r.sh Source2-MD5: aa5d58694004df09f486abc9907f7e0a Depends: cmake (>= 2.6.3-1) ------------------------------------------------------------------------------ OpenSolaris 2009.06 is a cutting edge operating system for enterprises looking to deploy the next generation of Solaris that includes the latest innovations from Sun and the OpenSource community. Download a copy and enjoy capabilities such as Networking, Storage and Virtualization. Go to: http://p.sf.net/sfu/opensolaris-get _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs