From 22b3bc53bb042729678657a13829b1030d44a66a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 24 Sep 2019 19:47:20 +0200 Subject: [PATCH] potrace: bump version. --- ...ce-1.15.patchset => potrace-1.16.patchset} | 21 ++++++++++--------- ...otrace-1.15.recipe => potrace-1.16.recipe} | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) rename media-gfx/potrace/patches/{potrace-1.15.patchset => potrace-1.16.patchset} (75%) rename media-gfx/potrace/{potrace-1.15.recipe => potrace-1.16.recipe} (91%) diff --git a/media-gfx/potrace/patches/potrace-1.15.patchset b/media-gfx/potrace/patches/potrace-1.16.patchset similarity index 75% rename from media-gfx/potrace/patches/potrace-1.15.patchset rename to media-gfx/potrace/patches/potrace-1.16.patchset index 6d8b3e2ca..0cf018921 100644 --- a/media-gfx/potrace/patches/potrace-1.15.patchset +++ b/media-gfx/potrace/patches/potrace-1.16.patchset @@ -1,14 +1,14 @@ -From c115adc6b93082b61fae3ae4400839fcb152df04 Mon Sep 17 00:00:00 2001 +From 26dac03854c3973beae9436d38fb4c8b1a1cbd4c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 1 Aug 2016 19:08:15 +0000 Subject: Haiku patch diff --git a/configure.ac b/configure.ac -index 354a640..e511232 100644 +index 26cfc91..fcbe5d6 100644 --- a/configure.ac +++ b/configure.ac -@@ -189,7 +189,7 @@ for PostScript level 3 compression.]) +@@ -190,7 +190,7 @@ for PostScript level 3 compression.]) ]) fi @@ -17,7 +17,7 @@ index 354a640..e511232 100644 dnl ---------------------------------------------------------------------- dnl Check for types -@@ -271,6 +271,7 @@ AC_SUBST(MKBITMAP) +@@ -272,6 +272,7 @@ AC_SUBST(MKBITMAP) AC_SUBST(EXTRA_OBJS) AC_SUBST(EXTRA_INCLUDES) AC_SUBST(EXTRA_LIBS) @@ -26,19 +26,20 @@ index 354a640..e511232 100644 AC_SUBST(POTRACELIB_VERSION) diff --git a/src/Makefile.am b/src/Makefile.am -index e83bfc1..a18574c 100644 +index 1a92572..cce2563 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -20,16 +20,16 @@ potrace_SOURCES = main.c main.h bitmap_io.c bitmap_io.h backend_eps.c \ - lzw.c lzw.h bitops.h auxiliary.h potracelib.h bitmap.h curve.h \ +@@ -21,17 +21,17 @@ potrace_SOURCES = main.c main.h bitmap_io.c bitmap_io.h backend_eps.c \ platform.h progress.h progress_bar.c progress_bar.h bbox.c bbox.h \ trans.c trans.h + EXTRA_potrace_SOURCES = getopt.c getopt1.c include/getopt/getopt.h -potrace_LDADD = libpotrace.la @EXTRA_OBJS@ -lm @EXTRA_LIBS@ +potrace_LDADD = libpotrace.la @EXTRA_OBJS@ @MATH_LIBS@ @EXTRA_LIBS@ potrace_DEPENDENCIES = libpotrace.la @EXTRA_OBJS@ mkbitmap_SOURCES = mkbitmap.c bitmap_io.c bitmap_io.h greymap.c \ greymap.h platform.h bitmap.h potracelib.h bitops.h + EXTRA_mkbitmap_SOURCES = getopt.c getopt1.c include/getopt/getopt.h -mkbitmap_LDADD = @EXTRA_OBJS@ -lm +mkbitmap_LDADD = @EXTRA_OBJS@ @MATH_LIBS@ mkbitmap_DEPENDENCIES = @EXTRA_OBJS@ @@ -49,9 +50,9 @@ index e83bfc1..a18574c 100644 potracelib_demo_DEPENDENCIES = libpotrace.la AM_CPPFLAGS = @EXTRA_INCLUDES@ -@@ -46,7 +46,7 @@ EXTRA_LTLIBRARIES = libpotrace.la +@@ -48,7 +48,7 @@ EXTRA_LTLIBRARIES = libpotrace.la libpotrace_la_SOURCES = $(libsources) - libpotrace_la_LDFLAGS = -version-info 0:5:0 -rpath '$(libdir)' \ + libpotrace_la_LDFLAGS = -version-info 0:6:0 -rpath '$(libdir)' \ -export-symbols $(srcdir)/libpotrace-export.sym -no-undefined -libpotrace_la_LIBADD = -lm +libpotrace_la_LIBADD = @MATH_LIBS@ @@ -59,5 +60,5 @@ index e83bfc1..a18574c 100644 # header files to install -- -2.13.1 +2.21.0 diff --git a/media-gfx/potrace/potrace-1.15.recipe b/media-gfx/potrace/potrace-1.16.recipe similarity index 91% rename from media-gfx/potrace/potrace-1.15.recipe rename to media-gfx/potrace/potrace-1.16.recipe index e74239694..b4d479c8e 100644 --- a/media-gfx/potrace/potrace-1.15.recipe +++ b/media-gfx/potrace/potrace-1.16.recipe @@ -22,7 +22,7 @@ COPYRIGHT="2001-2015 Peter Selinger" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://potrace.sourceforge.net/download/$portVersion/potrace-$portVersion.tar.gz" -CHECKSUM_SHA256="a9b33904ace328340c850a01458199e0064e03ccaaa731bc869a842b1b8d529d" +CHECKSUM_SHA256="be8248a17dedd6ccbaab2fcc45835bb0502d062e40fbded3bc56028ce5eb7acc" PATCHES="potrace-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -32,7 +32,7 @@ PROVIDES=" potrace$secondaryArchSuffix = $portVersion cmd:mkbitmap cmd:potrace - lib:libpotrace$secondaryArchSuffix = 0.0.5 compat >= 0 + lib:libpotrace$secondaryArchSuffix = 0.0.6 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix @@ -41,7 +41,7 @@ REQUIRES=" PROVIDES_devel=" potrace${secondaryArchSuffix}_devel = $portVersion - devel:libpotrace$secondaryArchSuffix = 0.0.5 compat >= 0 + devel:libpotrace$secondaryArchSuffix = 0.0.6 compat >= 0 " REQUIRES_devel=" haiku$secondaryArchSuffix