[SCM] jkmeter/master: Refreshed patches

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6802629db937cd1503bdeebca717c9ba595eefca
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Aug 3 03:02:36 2011 +0200

    Refreshed patches

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index ae17dfb..2011b59 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -1,47 +1,28 @@
 Description: Put DESTDIR before PREFIX to set the installation path properly.
- Set prefix properly and fix install commands.
- Pass -pthread flag to the linker to fix FTBFS with binutils-gold.
+ Set prefix properly and removed -march=native cpp flag
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: Fons Adriaensen <fons at kokkinizita.net>
----
- source/Makefile |   13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
 
---- jkmeter.orig/source/Makefile
-+++ jkmeter/source/Makefile
-@@ -14,8 +14,9 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+Index: jkmeter/source/Makefile
+===================================================================
+--- jkmeter.orig/source/Makefile	2011-08-03 02:45:40.420992633 +0200
++++ jkmeter/source/Makefile	2011-08-03 02:46:35.887176814 +0200
+@@ -19,14 +19,14 @@
+ # -------------------------------------------------------------------------
  
-+DESTDIR=
  
 -PREFIX = /usr/local
 +PREFIX = /usr
  SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
  LIBDIR = lib$(SUFFIX)
- SHARED = $(PREFIX)/share
-@@ -34,7 +35,7 @@ JKMETER_O = jkmeter.o styles.o mainwin.o
+ BINDIR = $(PREFIX)/bin
+ SHARED = $(PREFIX)/share/jkmeter
+ VERSION = 0.6.1
+-CPPFLAGS += -O2 -ffast-math -Wall -MMD -MP  -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
+-CPPFLAGS += -march=native
++CPPFLAGS += -O3 -ffast-math -Wall -MMD -MP  -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
++#CPPFLAGS += -march=native
  
- jkmeter:	CPPFLAGS += -ffast-math -I/usr/include/freetype2
- jkmeter:	LDLIBS += -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
--jkmeter:	LDFLAGS += -L/usr/X11R6/lib
-+jkmeter:	LDFLAGS += -L/usr/X11R6/lib -pthread
- jkmeter:	$(JKMETER_O)
- 	g++ $(LDFLAGS) -o $@ $(JKMETER_O) $(LDLIBS)
  
-@@ -43,10 +44,10 @@ $(JKMETER_O):
- 
- 
- install:	all
--	/usr/bin/install -d $(PREFIX)/bin
--	/usr/bin/install -m 755 jkmeter $(PREFIX)/bin
--	/usr/bin/install -d $(SHARED)/jkmeter
--	/usr/bin/install -m 644 ../share/* $(SHARED)/jkmeter
-+	/usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -m 755 jkmeter $(DESTDIR)$(PREFIX)/bin
-+	/usr/bin/install -d $(DESTDIR)$(SHARED)/jkmeter
-+	/usr/bin/install -m 644 ../share/* $(DESTDIR)$(SHARED)/jkmeter
- 
- clean:
- 	/bin/rm -f *~ *.o *.a *.d *.so
+ all:	jkmeter
diff --git a/debian/patches/02-build_with_new_libpng.patch b/debian/patches/02-build_with_new_libpng.patch
index 43b203b..da37254 100644
--- a/debian/patches/02-build_with_new_libpng.patch
+++ b/debian/patches/02-build_with_new_libpng.patch
@@ -2,21 +2,33 @@ Description: Fix FTBFS with libpng 1.5
 Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
 Forwarded: Yes
 
---- jkmeter-0.4.0.orig/source/mkimage.cc
-+++ jkmeter-0.4.0/source/mkimage.cc
-@@ -73,9 +73,15 @@ XImage *mkimage (const char *file, X_dis
+Index: jkmeter/source/png2img.cc
+===================================================================
+--- jkmeter.orig/source/png2img.cc	2011-08-03 02:49:35.525296179 +0200
++++ jkmeter/source/png2img.cc	2011-08-03 02:53:39.657304866 +0200
+@@ -76,16 +76,15 @@
                    PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_EXPAND,
                    0);
  
+-// This requires libpng14 or later. If you still have an
+-// older version, use the three commented lines instead.
+-
+-    dx = png_get_image_width (png_ptr, png_info);
+-    dy = png_get_image_height (png_ptr, png_info);
+-    dp = (png_get_color_type (png_ptr, png_info) & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
+-
+-//    dx = png_info->width;
+-//    dy = png_info->height;
+-//    dp = (png_info->color_type & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
 +#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
 +	dx = png_get_image_width(png_ptr, png_info);
 +	dy = png_get_image_height(png_ptr, png_info);
 +	dp = (png_get_color_type(png_ptr, png_info) & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
 +#else
-     dx = png_info->width;
-     dy = png_info->height;
-     dp = (png_info->color_type & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
++     dx = png_info->width;
++     dy = png_info->height;
++     dp = (png_info->color_type & PNG_COLOR_MASK_ALPHA) ? 4 : 3;
 +#endif
+ 
      data = (const unsigned char **)(png_get_rows (png_ptr, png_info));
  
-     image = XCreateImage (disp->dpy (),

-- 
jkmeter packaging