tags 736038 + patch tags 745516 + patch thanks Dear maintainer,
I've prepared an NMU for photoprint (versioned as 0.4.2~pre2-2.2). The diff is attached to this message. Regards. diff -Nru photoprint-0.4.2~pre2/debian/changelog photoprint-0.4.2~pre2/debian/changelog --- photoprint-0.4.2~pre2/debian/changelog 2013-06-23 15:41:31.000000000 +0200 +++ photoprint-0.4.2~pre2/debian/changelog 2014-08-11 20:54:09.000000000 +0200 @@ -1,3 +1,12 @@ +photoprint (0.4.2~pre2-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Applying patch from Hideki Ymanae (Closes: #725537) + * Change B-D from lcms1-dev to lcms2-dev (Closes: #745516) + * B-D on libtiff-dev, not libtiff4-dev" (Closes: #736038) + + -- Tobias Frost <t...@debian.org> Mon, 11 Aug 2014 20:53:54 +0200 + photoprint (0.4.2~pre2-2.1) unstable; urgency=low * Non-maintainer upload. diff -Nru photoprint-0.4.2~pre2/debian/control photoprint-0.4.2~pre2/debian/control --- photoprint-0.4.2~pre2/debian/control 2011-11-13 09:40:54.000000000 +0100 +++ photoprint-0.4.2~pre2/debian/control 2014-08-11 18:39:22.000000000 +0200 @@ -2,7 +2,7 @@ Section: graphics Priority: optional Maintainer: David Stone <da...@nnucomputerwhiz.com> -Build-Depends: debhelper (>= 7), libgtk2.0-dev, liblcms1-dev, libpng12-dev, libtiff4-dev, libnetpbm10-dev, libgutenprint-dev, chrpath, automake, libtool +Build-Depends: debhelper (>= 7), libgtk2.0-dev, liblcms2-dev, libpng12-dev, libtiff4-dev, libnetpbm10-dev, libgutenprint-dev, chrpath, automake, libtool, autopoint Standards-Version: 3.9.2 Homepage: http://blackfiveimaging.co.uk/index.php?article=02Software%2F01PhotoPrint diff -Nru photoprint-0.4.2~pre2/debian/patches/define_macro-dir.patch photoprint-0.4.2~pre2/debian/patches/define_macro-dir.patch --- photoprint-0.4.2~pre2/debian/patches/define_macro-dir.patch 1970-01-01 01:00:00.000000000 +0100 +++ photoprint-0.4.2~pre2/debian/patches/define_macro-dir.patch 2014-08-11 18:39:22.000000000 +0200 @@ -0,0 +1,19 @@ +Description: necessary to define macro directory + + If we don't specify it, it causes FTBFS. + +Author: Hideki Yamane <henr...@debian.org> +Bug-Debian: http://bugs.debian.org/725537 +Forwarded: no +Last-Update: 2013-10-16 + +--- photoprint-0.4.2~pre2.orig/configure.ac ++++ photoprint-0.4.2~pre2/configure.ac +@@ -7,6 +7,7 @@ AC_CONFIG_AUX_DIR([scripts]) + AC_CONFIG_SRCDIR([photoprint.cpp]) + AM_CONFIG_HEADER([config.h]) + AM_INIT_AUTOMAKE([1.9 foreign]) ++AC_CONFIG_MACRO_DIR([m4]) + + AM_GNU_GETTEXT_VERSION([0.17]) + AM_GNU_GETTEXT([external]) diff -Nru photoprint-0.4.2~pre2/debian/patches/fix-linking.patch photoprint-0.4.2~pre2/debian/patches/fix-linking.patch --- photoprint-0.4.2~pre2/debian/patches/fix-linking.patch 2011-11-13 09:40:54.000000000 +0100 +++ photoprint-0.4.2~pre2/debian/patches/fix-linking.patch 2014-08-11 20:37:09.000000000 +0200 @@ -1,10 +1,8 @@ Link to all libraries to make binutils-gold happy. -Index: photoprint/Makefile.am -=================================================================== ---- photoprint.orig/Makefile.am 2010-01-23 14:35:21.000000000 +0100 -+++ photoprint/Makefile.am 2010-01-23 14:35:32.000000000 +0100 -@@ -96,7 +96,8 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -97,7 +97,8 @@ stp_support/libstp_support.la \ pixbufthumbnail/libpixbufthumbnail.la \ splashscreen/libsplashscreen.la \ diff -Nru photoprint-0.4.2~pre2/debian/patches/fix_missinginclude.patch photoprint-0.4.2~pre2/debian/patches/fix_missinginclude.patch --- photoprint-0.4.2~pre2/debian/patches/fix_missinginclude.patch 1970-01-01 01:00:00.000000000 +0100 +++ photoprint-0.4.2~pre2/debian/patches/fix_missinginclude.patch 2014-08-11 20:51:35.000000000 +0200 @@ -0,0 +1,93 @@ +Description: Fixing missing includes +Author: Tobias Frost <t...@debian.orgl> +Forwarded: no +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/imageutils/jpegsave.cpp ++++ b/imageutils/jpegsave.cpp +@@ -16,6 +16,8 @@ + #include <setjmp.h> + #include <sys/stat.h> + ++#include <string.h> ++ + #include "debug.h" + #include "lcmswrapper.h" + #include "imagesource_flatten.h" +--- a/printpreview.cpp ++++ b/printpreview.cpp +@@ -14,6 +14,8 @@ + #include <iostream> + #include <string> + ++#include <string.h> ++ + #include <gtk/gtk.h> + #include <gdk/gdkkeysyms.h> + +--- a/profilemanager/profilemanager.cpp ++++ b/profilemanager/profilemanager.cpp +@@ -18,6 +18,8 @@ + #include "gettext.h" + #define _(x) gettext(x) + ++#include <string.h> ++ + using namespace std; + + +--- a/pp_layout_carousel_pageview.cpp ++++ b/pp_layout_carousel_pageview.cpp +@@ -6,6 +6,8 @@ + #include <gtk/gtkdnd.h> + #include <gtk/gtkmenu.h> + ++#include <string.h> ++ + #include "support/debug.h" + #include "support/layoutrectangle.h" + #include "stpui_widgets/stpui_combo.h" +--- a/pp_layout_nup_pageview.cpp ++++ b/pp_layout_nup_pageview.cpp +@@ -5,6 +5,8 @@ + #include <gtk/gtksignal.h> + #include <gtk/gtkdnd.h> + ++#include <string.h> ++ + #include "stpui_widgets/stpui_combo.h" + #include "pp_sigcontrol.h" + +--- a/pp_layout_poster_pageview.cpp ++++ b/pp_layout_poster_pageview.cpp +@@ -6,6 +6,8 @@ + #include <gtk/gtkdnd.h> + #include <gtk/gtkmenu.h> + ++#include <string.h> ++ + #include "support/layoutrectangle.h" + #include "support/debug.h" + +--- a/pp_layout_single_pageview.cpp ++++ b/pp_layout_single_pageview.cpp +@@ -6,6 +6,8 @@ + #include <gtk/gtkdnd.h> + #include <gtk/gtkmenu.h> + ++#include <string.h> ++ + #include "support/debug.h" + #include "support/layoutrectangle.h" + #include "stpui_widgets/stpui_combo.h" +--- a/pp_menu_layout.cpp ++++ b/pp_menu_layout.cpp +@@ -5,6 +5,8 @@ + #include <gtk/gtkcheckmenuitem.h> + #include <gtk/gtkmain.h> + ++#include <string.h> ++ + #include "pp_menu_layout.h" + #include "pp_mainwindow.h" + #include "dialogs.h" diff -Nru photoprint-0.4.2~pre2/debian/patches/series photoprint-0.4.2~pre2/debian/patches/series --- photoprint-0.4.2~pre2/debian/patches/series 2013-06-23 15:31:39.000000000 +0200 +++ photoprint-0.4.2~pre2/debian/patches/series 2014-08-11 20:46:20.000000000 +0200 @@ -4,3 +4,6 @@ fix-spelling.patch fix-man-page-minux.patch glib-single-include.patch +define_macro-dir.patch +fix_missinginclude.patch +support-lcms2.patch diff -Nru photoprint-0.4.2~pre2/debian/patches/support-lcms2.patch photoprint-0.4.2~pre2/debian/patches/support-lcms2.patch --- photoprint-0.4.2~pre2/debian/patches/support-lcms2.patch 1970-01-01 01:00:00.000000000 +0100 +++ photoprint-0.4.2~pre2/debian/patches/support-lcms2.patch 2014-08-11 21:03:00.000000000 +0200 @@ -0,0 +1,272 @@ +Description: Patch to migrate to lcms2 +Author: Tobias Frost <t...@debian.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745516 +Forwarded: no +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/profilemanager/lcmswrapper.h ++++ b/profilemanager/lcmswrapper.h +@@ -19,7 +19,7 @@ + #endif + #endif + +-#include <lcms.h> ++#include <lcms2.h> + #include "md5.h" + #include "imagesource_types.h" + +@@ -111,7 +111,7 @@ + public: + CMSWhitePoint(int degk) + { +- cmsWhitePointFromTemp(degk,&whitepoint); ++ cmsWhitePointFromTemp(&whitepoint,degk); + } + protected: + cmsCIExyY whitepoint; +@@ -147,18 +147,18 @@ + public: + CMSGamma(float gamma) + { +- gammatable=cmsBuildGamma(256,gamma); ++ gammatable=cmsBuildGamma(NULL,gamma); + } + ~CMSGamma() + { +- cmsFreeGamma(gammatable); ++ cmsFreeToneCurve(gammatable); + } +- LPGAMMATABLE GetGammaTable() ++ cmsToneCurve* GetGammaTable() + { + return(gammatable); + } + protected: +- LPGAMMATABLE gammatable; ++ cmsToneCurve* gammatable; + friend class CMSProfile; + friend class CMSRGBGamma; + }; +@@ -182,7 +182,7 @@ + } + protected: + CMSGamma redgamma,greengamma,bluegamma; +- LPGAMMATABLE gammatables[3]; ++ cmsToneCurve* gammatables[3]; + friend class CMSProfile; + }; + +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ + PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) + PKG_CHECK_MODULES([GDKPIXBUF2], [gdk-pixbuf-2.0]) + PKG_CHECK_MODULES([GP], [gutenprint]) +-PKG_CHECK_MODULES([LCMS], [lcms]) ++PKG_CHECK_MODULES([LCMS2], [lcms2]) + AC_CHECK_LIB(m,pow, LIBM_LIBS="-lm") + AC_SUBST([LIBM_LIBS]) + AC_CHECK_LIB([pnm], [pnm_readpaminit],,,[-lm]) +--- a/profilemanager/lcmswrapper.cpp ++++ b/profilemanager/lcmswrapper.cpp +@@ -18,6 +18,8 @@ + #include <iostream> + #include <fstream> + ++#include <string.h> ++ + #include "../support/debug.h" + + #ifdef HAVE_CONFIG_H +@@ -33,6 +35,51 @@ + + using namespace std; + ++// This snippets has been stolen from here: ++// https://www.vuiis.vanderbilt.edu/~welcheb/mac%20installs/GIMP/separate+-0.5.8/lcms_wrapper.h ++typedef cmsICCHeader icHeader; ++ ++typedef enum { ++ icSigInputClass = cmsSigInputClass, ++ icSigDisplayClass = cmsSigDisplayClass, ++ icSigOutputClass = cmsSigOutputClass, ++ icSigLinkClass = cmsSigLinkClass, ++ icSigAbstractClass = cmsSigAbstractClass, ++ icSigColorSpaceClass = cmsSigColorSpaceClass, ++ icSigNamedColorClass = cmsSigNamedColorClass, ++ icMaxEnumClass = 0xFFFFFFFFL ++} icProfileClassSignature; ++ ++typedef enum { ++ icSigXYZData = cmsSigXYZData, ++ icSigLabData = cmsSigLabData, ++ icSigLuvData = cmsSigLuvData, ++ icSigYCbCrData = cmsSigYCbCrData, ++ icSigYxyData = cmsSigYxyData, ++ icSigRgbData = cmsSigRgbData, ++ icSigGrayData = cmsSigGrayData, ++ icSigHsvData = cmsSigHsvData, ++ icSigHlsData = cmsSigHlsData, ++ icSigCmykData = cmsSigCmykData, ++ icSigCmyData = cmsSigCmyData, ++ icSig2colorData = cmsSig2colorData, ++ icSig3colorData = cmsSig3colorData, ++ icSig4colorData = cmsSig4colorData, ++ icSig5colorData = cmsSig5colorData, ++ icSig6colorData = cmsSig6colorData, ++ icSig7colorData = cmsSig7colorData, ++ icSig8colorData = cmsSig8colorData, ++ icSig9colorData = cmsSig9colorData, ++ icSig10colorData = cmsSig10colorData, ++ icSig11colorData = cmsSig11colorData, ++ icSig12colorData = cmsSig12colorData, ++ icSig13colorData = cmsSig13colorData, ++ icSig14colorData = cmsSig14colorData, ++ icSig15colorData = cmsSig15colorData, ++ icMaxEnumData = 0xFFFFFFFFL ++} icColorSpaceSignature; ++ ++ + CMSRGBPrimaries CMSPrimaries_Rec709(.64,.33,.3,.6,.15,.06); + CMSRGBPrimaries CMSPrimaries_Adobe(0.64, 0.33,0.21, 0.71,0.15, 0.06); + CMSRGBPrimaries CMSPrimaries_NTSC(0.67, 0.33, 0.21, 0.71,0.14, 0.08); +@@ -46,8 +93,6 @@ + if(!fn) + throw "NULL profile filename provided"; + +- cmsErrorAction(LCMS_ERROR_SHOW); +- + filename=strdup(fn); + + if(!(prof=cmsOpenProfileFromFile(filename,"r"))) +@@ -62,14 +107,14 @@ + if(generated) + { + Debug[TRACE] << "Saving profile to RAM for MD5 calculation." << endl; +- size_t plen=0; +- _cmsSaveProfileToMem(prof,NULL,&plen); ++ cmsUInt32Number plen=0; ++ cmsSaveProfileToMem(prof,NULL,&plen); + if(plen>0) + { + Debug[TRACE] << "Plen = " << plen << endl; + buflen=plen; + buffer=(char *)malloc(buflen); +- if(_cmsSaveProfileToMem(prof,buffer,&plen)) ++ if(cmsSaveProfileToMem(prof,buffer,&plen)) + { + Debug[TRACE] << "Saved successfully" << endl; + md5=new MD5Digest(buffer+sizeof(icHeader),buflen-sizeof(icHeader)); +@@ -117,7 +162,7 @@ + CMSProfile::CMSProfile(CMSWhitePoint &whitepoint) + : md5(NULL), generated(true), filename(NULL), buffer(NULL), buflen(0) + { +- if(!(prof=cmsCreateLabProfile(&whitepoint.whitepoint))) ++ if(!(prof=cmsCreateLab2Profile(&whitepoint.whitepoint))) + throw "Can't create virtual LAB profile"; + CalcMD5(); + } +@@ -199,14 +244,14 @@ + + bool CMSProfile::IsV4() + { +- Debug[TRACE] << "Profile version: " << cmsGetProfileICCversion(prof) << endl; +- return(cmsGetProfileICCversion(prof) >= 0x04000000L); ++ Debug[TRACE] << "Profile version: " << cmsGetEncodedICCversion(prof) << endl; ++ return(cmsGetEncodedICCversion(prof) >= 0x04000000L); + } + + + enum IS_TYPE CMSProfile::GetColourSpace() + { +- icColorSpaceSignature sig=cmsGetColorSpace(prof); ++ cmsColorSpaceSignature sig=cmsGetColorSpace(prof); + switch(sig) + { + case icSigGrayData: +@@ -232,7 +277,7 @@ + { + if(!IsDeviceLink()) + throw "GetDeviceLinkOutputSpace() can only be used on DeviceLink profiles!"; +- icColorSpaceSignature sig=cmsGetPCS(prof); ++ cmsColorSpaceSignature sig=cmsGetPCS(prof); + switch(sig) + { + case icSigGrayData: +@@ -253,14 +298,13 @@ + } + } + +- ++#if 0 + const char *CMSProfile::GetName() + { +- const char *txt=cmsTakeProductName(prof); +- if(txt) +- return(txt); +- else +- return("unknown"); ++ cmsUInt8Number profileID[17]; ++ profileID[16] = '\0'; ++ cmsGetHeaderProfileID(prof, profileID); ++ return((const char*)profileID); + } + + +@@ -283,17 +327,20 @@ + return("unknown"); + } + ++#endif + + const char *CMSProfile::GetDescription() + { +- const char *txt=cmsTakeProductDesc(prof); +- if(txt) +- return(txt); +- else +- return("unknown"); +-} ++ static char buf[100]; ++ memset(buf, 0, 100); ++ cmsUInt32Number ret; ++ ret = cmsGetProfileInfoASCII(prof, cmsInfoDescription, cmsNoLanguage, cmsNoCountry, buf, 99); + ++ if (ret) return buf; ++ return("unknown"); ++} + ++#if 0 + const char *CMSProfile::GetInfo() + { + const char *txt=cmsTakeProductInfo(prof); +@@ -312,7 +359,7 @@ + else + return("unknown"); + } +- ++#endif + + MD5Digest *CMSProfile::GetMD5() + { +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,7 +7,7 @@ + localedir=$(datadir)/locale + + AM_CXXFLAGS = -DLOCALEDIR=\"$(localedir)\" -Wall -I./support/ -I./miscwidgets -I./imagesource/ -I./splashscreen -I./profilemanager -I./effects \ +- $(LCMS_CFLAGS) $(GP_CFLAGS) $(GTK2_CFLAGS) ++ $(LCMS2_CFLAGS) $(GP_CFLAGS) $(GTK2_CFLAGS) + + bin_PROGRAMS = photoprint + +@@ -97,7 +97,7 @@ + stp_support/libstp_support.la \ + pixbufthumbnail/libpixbufthumbnail.la \ + splashscreen/libsplashscreen.la \ +- $(LIBINTL) $(LIBM_LIBS) $(GETOPT_LIBS) $(JPEG_LIBS) $(PNM_LIBS) $(TIFF_LIBS) $(LCMS_LIBS) $(GP_LIBS) $(GTK2_LIBS) \ ++ $(LIBINTL) $(LIBM_LIBS) $(GETOPT_LIBS) $(JPEG_LIBS) $(PNM_LIBS) $(TIFF_LIBS) $(LCMS2_LIBS) $(GP_LIBS) $(GTK2_LIBS) \ + -lX11 + + check_PROGRAMS = menucheck carouselcheck misccheck + diff -Nru photoprint-0.4.2~pre2/debian/rules photoprint-0.4.2~pre2/debian/rules --- photoprint-0.4.2~pre2/debian/rules 2011-11-13 09:40:54.000000000 +0100 +++ photoprint-0.4.2~pre2/debian/rules 2014-08-11 18:39:22.000000000 +0200 @@ -40,7 +40,7 @@ configure-stamp: dh_testdir libtoolize --copy --force - autoreconf + autoreconf -fi ./configure --prefix=/usr --disable-rpath $(confflags) touch configure-stamp -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
