From eb3b51c81a07c6b87ce8b4320eb00c43914f5172 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Thu, 30 Jan 2014 00:30:20 +0700 Subject: graphics/oyranos: Updated for version 0.9.4 + New Maintainer. Signed-off-by: Willy Sudiarto Raharjo --- graphics/oyranos/configure_tests.patch | 10 ---------- graphics/oyranos/makefile.in.patch | 11 ----------- graphics/oyranos/oyranos.SlackBuild | 16 +++++----------- graphics/oyranos/oyranos.info | 12 ++++++------ graphics/oyranos/oyranos_file.cpp.patch | 11 ----------- graphics/oyranos/qcmsevents.cpp.patch | 14 -------------- graphics/oyranos/slack-desc | 2 +- 7 files changed, 12 insertions(+), 64 deletions(-) delete mode 100644 graphics/oyranos/configure_tests.patch delete mode 100644 graphics/oyranos/makefile.in.patch delete mode 100644 graphics/oyranos/oyranos_file.cpp.patch delete mode 100644 graphics/oyranos/qcmsevents.cpp.patch diff --git a/graphics/oyranos/configure_tests.patch b/graphics/oyranos/configure_tests.patch deleted file mode 100644 index 5c39da517e..0000000000 --- a/graphics/oyranos/configure_tests.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- oyranos-0.4.0/configure_tests.sh 2012-03-10 19:28:12.016514261 +0100 -+++ oyranos-0.4.0/configure_tests.sh.new 2012-03-10 19:30:04.230678948 +0100 -@@ -3,7 +3,7 @@ - set > testset.txt - ERROR=0 - WARNING=0 --STRIPOPT='s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' -+STRIPOPT='s/-Wl[^ ]*//g ; s/-O.// ; s/-isysroot [[:graph:]]*// ; s/-arch ppc// ; s/-arch i386//' - - mkdir -p tests diff --git a/graphics/oyranos/makefile.in.patch b/graphics/oyranos/makefile.in.patch deleted file mode 100644 index 1396785f25..0000000000 --- a/graphics/oyranos/makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- oyranos-0.4.0/makefile.in 2012-02-23 17:07:13.000000000 +0100 -+++ oyranos-0.4.0/makefile.in.a 2012-03-15 13:02:20.492272906 +0100 -@@ -999,7 +999,7 @@ - OY_MODULE_PATHS=. LD_LIBRARY_PATH=./:$(libdir):$${LD_LIBRARY_PATH} tests/test_oyranos - - examples: all -- cd examples && ($(MAKE) clean; PATH="$(PATH):$(bindir):.." LD_LIBRARY_PATH=./:$(libdir):$${LD_LIBRARY_PATH} PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(DESTDIR)$(libdir)/pkgconfig:.." INCLUDE="-I$(includedir) -I$(SRCDIR) -I../ -I$(SRCDIR)/$(GENDIR)" SRCDIR=$(SRCDIR)/examples/ CFLAGS="$(CFLAGS)" LIBS="-L$(libdir) -L../" intl="$(intl)" $(MAKE)) -+ cd examples && ($(MAKE) clean; PATH="$(PATH):$(bindir):.." LD_LIBRARY_PATH=./:$(libdir):$${LD_LIBRARY_PATH} PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(DESTDIR)$(libdir)/pkgconfig:.." INCLUDE="-I$(includedir) -I$(SRCDIR) -I../ -I$(SRCDIR)/$(GENDIR)" SRCDIR=$(SRCDIR)/examples/ CFLAGS="$(CFLAGS)" LIBS="-L../ -L$(libdir)" intl="$(intl)" $(MAKE)) - - oforms: all $(LIB_FORMS_FLTK_NAME) - cd oforms && (PATH="$(PATH):$(bindir):.." LD_LIBRARY_PATH=./:$(libdir):$${LD_LIBRARY_PATH} PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):$(DESTDIR)$(libdir)/pkgconfig:.." CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" INCLUDE="-I$(includedir) -I$(SRCDIR) -I../ -I$(SRCDIR)/$(GENDIR)" SRCDIR=$(SRCDIR)/oforms/ LDFLAGS="-L../ $(intl) $(LDFLAGS)" $(MAKE) -f oyranos_xforms.makefile) diff --git a/graphics/oyranos/oyranos.SlackBuild b/graphics/oyranos/oyranos.SlackBuild index 81728e4ce7..8131cb0ae9 100644 --- a/graphics/oyranos/oyranos.SlackBuild +++ b/graphics/oyranos/oyranos.SlackBuild @@ -1,11 +1,11 @@ #!/bin/sh # Slackware build script for xcm -# Written by Diogo Leal (diogo@diogoleal.com) -# Modified by Willy Sudiarto Raharjo +# Originally Written by Diogo Leal (diogo@diogoleal.com) +# Currently maintained by Dimitris Zlatanidis PRGNAM=oyranos -VERSION=${VERSION:-0.4.0} +VERSION=${VERSION:-0.9.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,11 +51,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/configure_tests.patch -patch -p1 < $CWD/makefile.in.patch -patch -p1 < $CWD/oyranos_file.cpp.patch -patch -p1 < $CWD/qcmsevents.cpp.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -73,10 +68,9 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +mv $PKG/usr/share/man $PKG/usr +find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; -# --docdir does not work mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/ find $PKG/usr/share/ -type d -empty -depth -exec rmdir {} \; diff --git a/graphics/oyranos/oyranos.info b/graphics/oyranos/oyranos.info index 35e53184aa..349833f64f 100644 --- a/graphics/oyranos/oyranos.info +++ b/graphics/oyranos/oyranos.info @@ -1,10 +1,10 @@ PRGNAM="oyranos" -VERSION="0.4.0" +VERSION="0.9.4" HOMEPAGE="http://www.oyranos.org/" -DOWNLOAD="http://downloads.sourceforge.net/oyranos/oyranos-0.4.0.tar.bz2" -MD5SUM="4ec2c728c5ca7d450c47d95405de3ade" +DOWNLOAD="http://downloads.sourceforge.net/project/oyranos/Oyranos/Oyranos%200.9/oyranos-0.9.4.tar.bz2" +MD5SUM="582ea87d82a42912ddc45937e4f864b4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fltk yajl" -MAINTAINER="Diogo Leal" -EMAIL="diogo@diogoleal.com" +REQUIRES="yajl" +MAINTAINER="Dimitris Zlatanidis" +EMAIL="d.zlatanidis@gmail.com" diff --git a/graphics/oyranos/oyranos_file.cpp.patch b/graphics/oyranos/oyranos_file.cpp.patch deleted file mode 100644 index 83462061e3..0000000000 --- a/graphics/oyranos/oyranos_file.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- oyranos-0.4.0/examples/libraw/oyranos_file.cpp 2012-03-10 20:39:13.754934907 +0100 -+++ oyranos-0.4.0/examples/libraw/oyranos_file.cpp.new 2012-03-10 20:39:18.317895815 +0100 -@@ -15,7 +15,7 @@ - */ - /* c++ -Wall -g oyranos_file.cpp `pkg-config --cflags --libs oyranos` -o oyranos-file */ - --#include -+#include - #include - #include - #include diff --git a/graphics/oyranos/qcmsevents.cpp.patch b/graphics/oyranos/qcmsevents.cpp.patch deleted file mode 100644 index 33a271b24b..0000000000 --- a/graphics/oyranos/qcmsevents.cpp.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- oyranos-0.4.0/examples/xcmsevents/qcmsevents.cpp 2012-05-02 21:58:50.309004915 +0200 -+++ oyranos-0.4.0/examples/xcmsevents/qcmsevents.cpp.new 2012-05-02 21:58:32.533739653 +0200 -@@ -118,8 +118,8 @@ - else if (XCME_MSG_DISPLAY_STATUS) - { - int i; -- if(strstr(text, "atom: \""XCM_COLOR_DESKTOP"\":")) -- sscanf( text, "atom: \""XCM_COLOR_DESKTOP"\": %d %d", &i, &pid ); -+ if(strstr(text, "atom: \"" XCM_COLOR_DESKTOP "\":")) -+ sscanf( text, "atom: \"" XCM_COLOR_DESKTOP "\": %d %d", &i, &pid ); - if(pid == 0) - { - colour.setHsvF( 0.6, 0.4, 0.9 ); - diff --git a/graphics/oyranos/slack-desc b/graphics/oyranos/slack-desc index b2e95496c5..731c62e2c9 100644 --- a/graphics/oyranos/slack-desc +++ b/graphics/oyranos/slack-desc @@ -15,5 +15,5 @@ oyranos: colours accross supporting applications. One goal is to make colour oyranos: management useful for all users in a automated fashion and regardless oyranos: of any technical knowledge. oyranos: -oyranos: +oyranos: Homepage: http://www.oyranos.org oyranos: -- cgit v1.2.3