sergiomb pushed to pngquant (f22). "Update to 2.4.0"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 18 23:24:45 UTC 2015
>From f537fd3411935e695744fcaed53b5d14c26c5d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Basto?= <sergio at serjux.com>
Date: Sun, 19 Apr 2015 00:01:07 +0100
Subject: Update to 2.4.0
diff --git a/pngquant-2.3.2_fix-Makefile.patch b/pngquant-2.3.2_fix-Makefile.patch
deleted file mode 100644
index 5bcfa2e..0000000
--- a/pngquant-2.3.2_fix-Makefile.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- ./lib/Makefile.orig 2014-07-11 23:06:08.000000000 +0100
-+++ ./lib/Makefile 2014-09-27 04:27:47.371160997 +0100
-@@ -1,6 +1,8 @@
- -include config.mk
-
- STATICLIB=libimagequant.a
-+SHAREDLIB=libimagequant.so
-+SOVER=0
-
- DLL=libimagequant.dll
- DLLIMP=libimagequant_dll.a
-@@ -14,10 +16,12 @@ DISTFILES = $(OBJS:.o=.c) *.h MANUAL.md
- TARNAME = libimagequant-$(VERSION)
- TARFILE = $(TARNAME)-src.tar.bz2
-
--all: static
-+all: shared
-
- static: $(STATICLIB)
-
-+shared: $(SHAREDLIB)
-+
- dll:
- $(MAKE) CFLAGSADD="-DLIQ_EXPORT='__declspec(dllexport)'" $(DLL)
-
-@@ -28,6 +32,10 @@ $(DLL) $(DLLIMP): $(OBJS)
- $(STATICLIB): $(OBJS)
- $(AR) $(ARFLAGS) $@ $^
-
-+$(SHAREDLIB): $(OBJS)
-+ $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) $(LDFLAGS) $(OBJS) -o $(SHAREDLIB).$(SOVER)
-+ ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB)
-+
- $(OBJS): $(wildcard *.h) config.mk
-
- dist: $(TARFILE)
---- ./configure.orig 2014-09-27 05:12:31.526575414 +0100
-+++ ./configure 2014-09-27 06:01:41.336738912 +0100
-@@ -230,7 +230,6 @@ status "Compiler" "$CC"
- # init flags
- CFLAGS=${CFLAGS:--O3 -fno-math-errno -funroll-loops -fomit-frame-pointer -Wall}
- cflags "-std=c99 -I."
--lflags "-lm lib/libimagequant.a"
-
- # DEBUG
- if [ -z "$DEBUG" ]; then
---- ./Makefile.orig 2015-01-06 16:13:51.000000000 +0000
-+++ ./Makefile 2015-01-06 23:10:30.660389846 +0000
-@@ -11,6 +11,8 @@ OBJS += $(COCOA_OBJS)
- endif
-
- STATICLIB = lib/libimagequant.a
-+SHAREDLIB = lib/libimagequant.so
-+SOVER = 0
-
- DISTFILES = *.[chm] pngquant.1 Makefile configure README.md INSTALL CHANGELOG COPYRIGHT
- TARNAME = pngquant-$(VERSION)
-@@ -27,13 +29,16 @@ all: $(BIN)
- $(STATICLIB):: config.mk
- $(MAKE) -C lib static
-
-+$(SHAREDLIB):: config.mk
-+ $(MAKE) -C lib shared
-+
- $(OBJS): $(wildcard *.h) config.mk
-
- rwpng_cocoa.o: rwpng_cocoa.m
- $(CC) -Wno-enum-conversion -c $(CFLAGS) -o $@ $< || clang -Wno-enum-conversion -c -O3 $(CFLAGS) -o $@ $<
-
--$(BIN): $(STATICLIB) $(OBJS)
-- $(CC) $(OBJS) $(LDFLAGS) -o $@
-+$(BIN): $(SHAREDLIB) $(OBJS)
-+ $(CC) $(OBJS) $(LDFLAGS) $(SHAREDLIB) -o $@
-
- dist: $(TARFILE)
-
-@@ -54,7 +59,7 @@ uninstall:
-
- clean:
- $(MAKE) -C lib clean
-- rm -f $(BIN) $(OBJS) $(COCOA_OBJS) $(STATICLIB) $(TARFILE)
-+ rm -f $(BIN) $(OBJS) $(COCOA_OBJS) $(SHAREDLIB) $(TARFILE)
-
- distclean: clean
- $(MAKE) -C lib distclean
diff --git a/pngquant-2.4.0_fix-Makefile.patch b/pngquant-2.4.0_fix-Makefile.patch
new file mode 100644
index 0000000..3906e07
--- /dev/null
+++ b/pngquant-2.4.0_fix-Makefile.patch
@@ -0,0 +1,44 @@
+Only in pngquant-2.4.0.1/: configure.rej
+Only in pngquant-2.4.0.1/lib: Makefile.orig
+Only in pngquant-2.4.0.1/lib: Makefile.rej
+diff -urp pngquant-2.4.0.1.orig/Makefile pngquant-2.4.0.1/Makefile
+--- pngquant-2.4.0.1.orig/Makefile 2015-04-11 23:24:38.000000000 +0100
++++ pngquant-2.4.0.1/Makefile 2015-04-18 23:53:29.737846589 +0100
+@@ -11,6 +11,7 @@ OBJS += $(COCOA_OBJS)
+ endif
+
+ STATICLIB = lib/libimagequant.a
++SHAREDLIB = lib/libimagequant.so.0
+
+ DISTFILES = *.[chm] pngquant.1 Makefile configure README.md INSTALL CHANGELOG COPYRIGHT
+ TARNAME = pngquant-$(VERSION)
+@@ -29,12 +30,17 @@ staticlib:
+
+ $(STATICLIB): config.mk staticlib
+
++sharedlib:
++ $(MAKE) -C lib shared
++
++$(SHAREDLIB): config.mk sharedlib
++
+ $(OBJS): $(wildcard *.h) config.mk
+
+ rwpng_cocoa.o: rwpng_cocoa.m
+ $(CC) -Wno-enum-conversion -c $(CFLAGS) -o $@ $< || clang -Wno-enum-conversion -c -O3 $(CFLAGS) -o $@ $<
+
+-$(BIN): $(OBJS) $(STATICLIB)
++$(BIN): $(OBJS) $(SHAREDLIB)
+ $(CC) $^ $(LDFLAGS) -o $@
+
+ test: $(BIN)
+@@ -60,7 +66,7 @@ uninstall:
+
+ clean:
+ $(MAKE) -C lib clean
+- rm -f '$(BIN)' $(OBJS) $(COCOA_OBJS) $(STATICLIB) $(TARFILE)
++ rm -f '$(BIN)' $(OBJS) $(COCOA_OBJS) $(SHAREDLIB) $(TARFILE)
+
+ distclean: clean
+ $(MAKE) -C lib distclean
+Only in pngquant-2.4.0.1/: Makefile.orig
+Only in pngquant-2.4.0.1/: Makefile.rej
diff --git a/sources b/sources
index 9530672..b466c37 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f1e98e0ad8378c879765e86180b62ca pngquant-2.3.4.tar.gz
+d0e6c767f49594b87c20a55e09f87669 pngquant-2.4.0.1.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/pngquant.git/commit/?h=f22&id=f537fd3411935e695744fcaed53b5d14c26c5d50
More information about the scm-commits
mailing list