[arch-commits] Commit in cinepaint/trunk (4 files)

Eric Bélanger eric at archlinux.org
Sun Jul 10 02:10:18 UTC 2011


    Date: Saturday, July 9, 2011 @ 22:10:18
  Author: eric
Revision: 131074

upgpkg: cinepaint 0.25.0-1
Upstream update to 0.25.0 using cvs snapshot, Removed old patches, PKGBUILD cleanup

Modified:
  cinepaint/trunk/PKGBUILD
Deleted:
  cinepaint/trunk/cinepaint-0.22.1-ambiguousawake.patch
  cinepaint/trunk/cinepaint-0.22.1-gcc43.patch
  cinepaint/trunk/cinepaint-0.22.1-multiple_parameters_named.patch

--------------------------------------------------+
 PKGBUILD                                         |   54 ++++-----------
 cinepaint-0.22.1-ambiguousawake.patch            |   11 ---
 cinepaint-0.22.1-gcc43.patch                     |   73 ---------------------
 cinepaint-0.22.1-multiple_parameters_named.patch |   42 ------------
 4 files changed, 15 insertions(+), 165 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-10 01:00:47 UTC (rev 131073)
+++ PKGBUILD	2011-07-10 02:10:18 UTC (rev 131074)
@@ -3,62 +3,38 @@
 # Contributor: tobias [tobias.justdreams.de]
 
 pkgname=cinepaint
-_srcver=0.22-1
-pkgver=${_srcver/-/.}
-pkgrel=8
-pkgdesc="Sophisticated graphics manipulation programm supporting >8bit pictures"
+pkgver=0.25.0
+pkgrel=1
+pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL' 'MIT')
 url="http://www.cinepaint.org"
-depends=('gtk2>=2.18.6' 'openexr>=1.6.1' 'lcms>=1.18' 'libxpm>=3.5.7' 'fltk' 
-         'desktop-file-utils' 'ftgl>=2.1.3rc5')
+depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'desktop-file-utils')
 makedepends=('python2' 'gutenprint')
 optdepends=('python2: for python plug-ins' 'gutenprint: for print plug-ins')
 options=('!libtool')
 install=cinepaint.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_srcver}.tar.gz
-        LICENSE
-        cinepaint-0.22.1-gcc43.patch
-        cinepaint-0.22.1-multiple_parameters_named.patch
-        cinepaint-0.22.1-ambiguousawake.patch
-	cinepaint-0.22-gcc44.patch)
-md5sums=('f360587240db6b6d2f0bfd94c420c492'
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
+        LICENSE cinepaint-0.22-gcc44.patch)
+md5sums=('6ac099e3bc543e2460dfbffa7411d477'
          '169085743f667c250ea2e4022efecf5f'
-         'f05e17a16d0018e5301aff0e1fa597b0'
-         '0876510a5ce3d581ebdde7e18199c09f'
-         '4586aa153a0d3cac36120afc1f95a880'
          '368e820c27f525e3569d43388f1c119a')
 
 build() {
-  cd "${srcdir}/${pkgname}-${_srcver}"
- # FIXES
-  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-gcc43.patch"
-  patch -Np1 -i "${srcdir}/cinepaint-0.22-gcc44.patch"
-  patch -Np1 -i "${srcdir}/cinepaint-0.22.1-multiple_parameters_named.patch"
-  patch -Np0 -i "${srcdir}/cinepaint-0.22.1-ambiguousawake.patch"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/cinepaint-0.22-gcc44.patch"
   find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  find plug-ins/print -type f -exec  sed -i "s:gutenprintui/gutenprintui:gutenprintui2/gutenprintui:" {} \;
-  sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' lib/fl_i18n/fl_i18n.cxx
-  sed -i 's|Fl/Fl_Widget.H|FL/Fl_Widget.H|' plug-ins/icc_examin/icc_examin/icc_helfer.h
-  sed -i 's|Fl/Fl.H|FL/Fl.H|' plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp
-  sed -i 's|Fl/Fl_File_Chooser.H|FL/Fl_File_Chooser.H|' plug-ins/icc_examin/icc_examin/fl_i18n/fl_i18n.cxx
+  sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
 
-  # Fix insecure rpath
-  sed '/-rpath/d' -i plug-ins/icc_examin/icc_examin/configure
-
- # build
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --enable-gtk2 --enable-pygimp \
-    --with-python=/usr/bin/python2
- # FIXES
-  sed -i 's/^\(X_LIBS.*\)$/\1 -lpthread/' plug-ins/openexr/Makefile
+  ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
+    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${_srcver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  sed -i -e "s|-I$srcdir/cinepaint-0.22-1||" -e "s|-I$srcdir/cinepaint-0.22-1/lib||" -e "/libcinepaint.la/d" \
-    -e "s|$srcdir/cinepaint-0.22-1/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
+  sed -i -e "s|-I$srcdir/cinepaint-$pkgver||" -e "s|-I$srcdir/cinepaint-$pkgver/lib||" -e "/libcinepaint.la/d" \
+    -e "s|$srcdir/cinepaint-$pkgver/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
   install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: cinepaint-0.22.1-ambiguousawake.patch
===================================================================
--- cinepaint-0.22.1-ambiguousawake.patch	2011-07-10 01:00:47 UTC (rev 131073)
+++ cinepaint-0.22.1-ambiguousawake.patch	2011-07-10 02:10:18 UTC (rev 131074)
@@ -1,11 +0,0 @@
---- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig	2008-09-03 02:07:08.000000000 +0200
-+++ plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp	2008-09-03 02:08:02.000000000 +0200
-@@ -226,7 +226,7 @@
- 
-   int  awake(void)
-   {
--    Fl::awake(0);
-+    Fl::awake((void *)0);
-     return 0;
-   }
-   int  leerWait(void) { return 0; }

Deleted: cinepaint-0.22.1-gcc43.patch
===================================================================
--- cinepaint-0.22.1-gcc43.patch	2011-07-10 01:00:47 UTC (rev 131073)
+++ cinepaint-0.22.1-gcc43.patch	2011-07-10 02:10:18 UTC (rev 131074)
@@ -1,73 +0,0 @@
-Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
-+++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
-@@ -34,6 +34,7 @@
- 
- 
- #include <fstream>
-+#include <cstring>
- #include "TNT/tnt_misc.hpp"     // proof_least_square_fit()
- #include "TNT/tnt_stopwatch.hpp"
- #include "TNT/jama_qr.hpp"      // JAMA::QR
-Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
-+++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
-@@ -26,6 +26,7 @@
- */
- #include <iostream>
- #include <cmath>                    // pow()
-+#include <cstring>
- 
- #include "br_types.hpp"             // ImageID
- #include "br_enums.hpp"             // DataType, ReportWhat
-Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
-+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
-@@ -29,6 +29,7 @@
- 
- #include "icc_utils.h"
- #include "icc_fenster.h"
-+#include <cstdlib>
- 
- using namespace icc_examin_ns;
- 
-Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_speicher.h
-+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
-@@ -33,6 +33,8 @@
- 
- #include "icc_utils.h"
- #include <string>
-+#include <cstdlib>
-+#include <cstring>
- 
- #define DBG_SPEICHER_START   if(icc_debug >= 3) DBG_PROG_START
- #define DBG_SPEICHER_ENDE    if(icc_debug >= 3) DBG_PROG_ENDE
-Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/threads.cpp
-+++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
-@@ -42,6 +42,7 @@
- #include <iostream>
- #  if HAVE_PTHREAD_H
- // Use POSIX threading...
-+#include <climits>
- 
- int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p)
- {
-Index: cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
-===================================================================
---- cinepaint-0.22-1.orig/plug-ins/pdf/pdf.cpp
-+++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
-@@ -39,6 +39,7 @@
- 
- #include "pdf.h"
- #include "pdf_dialog.h"
-+#include <cstring>
- 
- extern "C" {
- #include <gtk/gtk.h>

Deleted: cinepaint-0.22.1-multiple_parameters_named.patch
===================================================================
--- cinepaint-0.22.1-multiple_parameters_named.patch	2011-07-10 01:00:47 UTC (rev 131073)
+++ cinepaint-0.22.1-multiple_parameters_named.patch	2011-07-10 02:10:18 UTC (rev 131074)
@@ -1,42 +0,0 @@
---- ./plug-ins/icc_examin/icc_examin/icc_oyranos.h.orig	2008-06-27 19:28:52.000000000 +0200
-+++ ./plug-ins/icc_examin/icc_examin/icc_oyranos.h	2008-06-27 19:31:34.000000000 +0200
-@@ -142,9 +142,6 @@
- 
-     // colour transformations
-     ColourTransformKey erzeugeTrafo (
--                                  const char* eingangs_profil__geraet,
--                                  int         byte,
--                                  int         kanaele,
-                                   const char* ausgangs_profil__geraet,
-                                   int         byte,
-                                   int         kanaele,
-@@ -152,9 +149,6 @@
-                                   const char* cmm, // 4 bytes 'lcms' 'APPL'
-                                   int         cmm_optionen); // BPC, precission
-     ColourTransformKey erzeugeTrafo (
--                                  const char* eingangs_profil__geraet,
--                                  int         byte,
--                                  int         kanaele,
-                                   const char* ausgangs_profil__geraet,
-                                   int         byte,
-                                   int         kanaele,
-@@ -163,9 +157,6 @@
-                                   int         cmm_optionen,
-                                   std::list<const char*> &profile );
-     ColourTransformKey erzeugeTrafo (
--                                  const char* eingangs_profil__geraet,
--                                  int         byte,
--                                  int         kanaele,
-                                   const char* ausgangs_profil__geraet,
-                                   int         byte,
-                                   int         kanaele,
-@@ -181,9 +172,6 @@
-     std::string cmm;
-   private:
-     ColourTransformKey erzeugeSchluessel_ (
--                                  const char* eingangs_profil__geraet,
--                                  int         byte,
--                                  int         kanaele,
-                                   const char* ausgangs_profil__geraet,
-                                   int         byte,
-                                   int         kanaele,




More information about the arch-commits mailing list