pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print Move the glib/Makefile.in patch-aa from the popp...
details: https://anonhg.NetBSD.org/pkgsrc/rev/3d18dcd6f238
branches: trunk
changeset: 510640:3d18dcd6f238
user: reed <reed%pkgsrc.org@localhost>
date: Sat Apr 01 17:22:12 2006 +0000
description:
Move the glib/Makefile.in patch-aa from the poppler-glib/patches/
directory to the poppler/patches/ directory.
The checksum was removed, but patch still existed. So keep the patch
in same place as the distinfo.
Uncomment the PATCHDIR for this.
(The patch is so libpoppler is not rebuilt -- just use the
previously installed version. If there is any change my next
patch updates PKGREVISION so will cover this too.)
diffstat:
print/poppler-glib/patches/patch-aa | 40 -------------------------------------
print/poppler/Makefile.common | 4 +-
print/poppler/distinfo | 3 +-
print/poppler/patches/patch-aa | 40 +++++++++++++++++++++++++++++++++++++
4 files changed, 44 insertions(+), 43 deletions(-)
diffs (117 lines):
diff -r 32d84084eec6 -r 3d18dcd6f238 print/poppler-glib/patches/patch-aa
--- a/print/poppler-glib/patches/patch-aa Sat Apr 01 16:48:53 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/03/30 21:30:25 jmmv Exp $
-
---- glib/Makefile.in.orig 2006-02-28 23:51:30.000000000 +0100
-+++ glib/Makefile.in
-@@ -65,7 +65,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
- libpoppler_glib_la_DEPENDENCIES = \
-- $(top_builddir)/poppler/libpoppler.la \
-+ $(prefix)/lib/libpoppler.la \
- $(top_builddir)/poppler/libpoppler-cairo.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
-@@ -78,7 +78,7 @@ PROGRAMS = $(noinst_PROGRAMS)
- am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
- test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
- test_poppler_glib_DEPENDENCIES = \
-- $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
-+ $(prefix)/lib/libpoppler.la libpoppler-glib.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -306,7 +306,7 @@ libpoppler_glib_la_SOURCES = \
- poppler-private.h
-
- libpoppler_glib_la_LIBADD = \
-- $(top_builddir)/poppler/libpoppler.la \
-+ $(prefix)/lib/libpoppler.la \
- $(top_builddir)/poppler/libpoppler-cairo.la \
- $(POPPLER_GLIB_LIBS) \
- $(FREETYPE_LIBS) \
-@@ -317,7 +317,7 @@ test_poppler_glib_SOURCES = \
- test-poppler-glib.c
-
- test_poppler_glib_LDADD = \
-- $(top_builddir)/poppler/libpoppler.la \
-+ $(prefix)/lib/libpoppler.la \
- libpoppler-glib.la \
- $(POPPLER_GLIB_LIBS) \
- $(FREETYPE_LIBS) \
diff -r 32d84084eec6 -r 3d18dcd6f238 print/poppler/Makefile.common
--- a/print/poppler/Makefile.common Sat Apr 01 16:48:53 2006 +0000
+++ b/print/poppler/Makefile.common Sat Apr 01 17:22:12 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2006/03/30 21:30:25 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.4 2006/04/01 17:22:12 reed Exp $
#
POPPLER_VERS= 0.5.1
@@ -10,7 +10,7 @@
HOMEPAGE= http://poppler.freedesktop.org/
DISTINFO_FILE= ${.CURDIR}/../../print/poppler/distinfo
-#PATCHDIR= ${.CURDIR}/../../print/poppler/patches
+PATCHDIR= ${.CURDIR}/../../print/poppler/patches
USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
diff -r 32d84084eec6 -r 3d18dcd6f238 print/poppler/distinfo
--- a/print/poppler/distinfo Sat Apr 01 16:48:53 2006 +0000
+++ b/print/poppler/distinfo Sat Apr 01 17:22:12 2006 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2006/03/31 16:49:47 drochner Exp $
+$NetBSD: distinfo,v 1.10 2006/04/01 17:22:12 reed Exp $
SHA1 (poppler-0.5.1.tar.gz) = 8d654a0f8eb6ad8c8cb08ced24a06f1f5b13c711
RMD160 (poppler-0.5.1.tar.gz) = ffd39323da0e0c487a6e7de48d8a607385189ddd
Size (poppler-0.5.1.tar.gz) = 954930 bytes
+SHA1 (patch-aa) = 49ddf46f27dd2df065f5122fcc1bdb2a5ce3e546
diff -r 32d84084eec6 -r 3d18dcd6f238 print/poppler/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/poppler/patches/patch-aa Sat Apr 01 17:22:12 2006 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.5 2006/04/01 17:22:12 reed Exp $
+
+--- glib/Makefile.in.orig 2006-02-28 23:51:30.000000000 +0100
++++ glib/Makefile.in
+@@ -65,7 +65,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+ libpoppler_glib_la_DEPENDENCIES = \
+- $(top_builddir)/poppler/libpoppler.la \
++ $(prefix)/lib/libpoppler.la \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+@@ -78,7 +78,7 @@ PROGRAMS = $(noinst_PROGRAMS)
+ am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT)
+ test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS)
+ test_poppler_glib_DEPENDENCIES = \
+- $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \
++ $(prefix)/lib/libpoppler.la libpoppler-glib.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
+@@ -306,7 +306,7 @@ libpoppler_glib_la_SOURCES = \
+ poppler-private.h
+
+ libpoppler_glib_la_LIBADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ $(prefix)/lib/libpoppler.la \
+ $(top_builddir)/poppler/libpoppler-cairo.la \
+ $(POPPLER_GLIB_LIBS) \
+ $(FREETYPE_LIBS) \
+@@ -317,7 +317,7 @@ test_poppler_glib_SOURCES = \
+ test-poppler-glib.c
+
+ test_poppler_glib_LDADD = \
+- $(top_builddir)/poppler/libpoppler.la \
++ $(prefix)/lib/libpoppler.la \
+ libpoppler-glib.la \
+ $(POPPLER_GLIB_LIBS) \
+ $(FREETYPE_LIBS) \
Home |
Main Index |
Thread Index |
Old Index