[packages/icc_examin] - updated to 0.55 - updated configure,paths patches
qboosh
qboosh at pld-linux.org
Sun Mar 16 19:51:08 CET 2014
commit a03d4c6b0d05aca75ee2f175b2c0b9e8cfa83fb3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Mar 16 19:54:17 2014 +0100
- updated to 0.55
- updated configure,paths patches
icc_examin-configure.patch | 80 +++++++++++-----------------------------------
icc_examin-paths.patch | 16 +++++-----
icc_examin.spec | 9 +++---
3 files changed, 32 insertions(+), 73 deletions(-)
---
diff --git a/icc_examin.spec b/icc_examin.spec
index 1fbddba..05e2ee8 100644
--- a/icc_examin.spec
+++ b/icc_examin.spec
@@ -1,12 +1,12 @@
Summary: X Color Management tools
Summary(pl.UTF-8): Narzędzia X Color Management (do zarządzania kolorami w X)
Name: icc_examin
-Version: 0.54
-Release: 2
+Version: 0.55
+Release: 1
License: MIT
Group: X11/Applications/Graphics
Source0: http://downloads.sourceforge.net/oyranos/%{name}-%{version}.tar.bz2
-# Source0-md5: 4add0302cc7978549335f507d711605c
+# Source0-md5: 51ba3b849eb47793974cab6956750cf0
Patch0: %{name}-configure.patch
Patch1: %{name}-paths.patch
Patch2: %{name}-pld.patch
@@ -21,7 +21,7 @@ BuildRequires: lcms-devel >= 1.14
BuildRequires: libXcm-devel
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
-BuildRequires: oyranos-devel
+BuildRequires: oyranos-devel >= 0.9.5
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXinerama-devel
BuildRequires: xorg-lib-libXxf86vm-devel
@@ -30,6 +30,7 @@ Requires: fltk >= 1.1.4
Requires: fonts-TTF-DejaVu
Requires: ftgl >= 2.1.2
Requires: lcms >= 1.14
+Requires: oyranos-libs >= 0.9.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
diff --git a/icc_examin-configure.patch b/icc_examin-configure.patch
index 71e4995..6239890 100644
--- a/icc_examin-configure.patch
+++ b/icc_examin-configure.patch
@@ -1,5 +1,5 @@
---- icc_examin-0.54/configure_tests.sh.orig 2012-12-20 18:38:30.459364279 +0100
-+++ icc_examin-0.54/configure_tests.sh 2013-03-31 14:50:55.109904248 +0200
+--- icc_examin-0.55/configure_tests.sh.orig 2013-05-02 13:10:35.207244645 +0200
++++ icc_examin-0.55/configure_tests.sh 2014-03-16 18:28:08.829359193 +0100
@@ -529,6 +529,7 @@
if [ -n "$XCM" ] && [ $XCM -gt 0 ]; then
@@ -8,9 +8,9 @@
version=""
pc_package=xcm
name="xcm"
-@@ -543,7 +544,8 @@
+@@ -581,7 +582,8 @@
if [ -z "$found" ]; then
- pkg-config --atleast-version=0.2 $pc_package
+ pkg-config --atleast-version=1.0 $pc_package
if [ $? = 0 ]; then
- found=`pkg-config --cflags $pc_package`
+ found=yes
@@ -18,48 +18,7 @@
version=`pkg-config --modversion $pc_package`
fi
fi
-@@ -557,7 +559,7 @@
- if [ -n "$MAKEFILE_DIR" ]; then
- for i in $MAKEFILE_DIR; do
- test -f "$ROOT_DIR/$i/makefile".in && echo "XCM = 1" >> "$i/makefile"
-- test -f "$ROOT_DIR/$i/makefile".in && echo "XCM_H = $found" >> "$i/makefile"
-+ test -f "$ROOT_DIR/$i/makefile".in && echo "XCM_H = $cflags" >> "$i/makefile"
- test -f "$ROOT_DIR/$i/makefile".in && echo "$ID_LIBS = `pkg-config --libs $name | sed \"$STRIPOPT\"`" >> "$i/makefile"
- done
- fi
-@@ -575,22 +577,27 @@
-
- if [ -n "$X11" ] && [ $X11 -gt 0 ]; then
- found=""
-+ cflags=""
- version=""
- pc_package=x11
- if [ -z "$found" ]; then
- pkg-config --atleast-version=1.0 $pc_package
- if [ $? = 0 ]; then
-- found=`pkg-config --cflags $pc_package`
-+ found=yes
-+ cflags=`pkg-config --cflags $pc_package`
- version=`pkg-config --modversion $pc_package`
- fi
- fi
- if [ -z "$found" ]; then
- if [ -f /usr/X11R6/include/X11/Xlib.h ]; then
-- found="-I/usr/X11R6/include"
-+ cflags="-I/usr/X11R6/include"
-+ found=yes
- elif [ -f /usr/include/X11/Xlib.h ]; then
-- found="-I/usr/include"
-+ cflags="-I/usr/include"
-+ found=yes
- elif [ -f $includedir/X11/Xlib.h ]; then
-- found="-I$includedir"
-+ cflags="-I$includedir"
-+ found=yes
- fi
- fi
- if [ -z "$found" ] && [ $OSUNAME = "Linux" ]; then
-@@ -603,22 +610,27 @@
+@@ -604,22 +606,27 @@
if [ -n "$X11" ] && [ $X11 -gt 0 ]; then
if [ -n "$XF86VMODE" ] && [ $XF86VMODE -gt 0 ]; then
found=""
@@ -78,20 +37,20 @@
if [ -z "$found" ]; then
if [ -f /usr/X11R6/include/X11/extensions/xf86vmode.h ]; then
- found="-I/usr/X11R6/include"
++ found=yes
+ cflags="-I/usr/X11R6/include"
-+ found=yes
elif [ -f /usr/include/X11/extensions/xf86vmode.h ]; then
- found="-I/usr/include"
++ found=yes
+ cflags="-I/usr/include"
-+ found=yes
elif [ -f $includedir/X11/extensions/xf86vmode.h ]; then
- found="-I$includedir"
++ found=yes
+ cflags="-I$includedir"
-+ found=yes
fi
fi
if [ -n "$found" ]; then
-@@ -631,7 +643,7 @@
+@@ -632,7 +639,7 @@
if [ -n "$MAKEFILE_DIR" ]; then
for i in $MAKEFILE_DIR; do
test -f "$ROOT_DIR/$i/makefile".in && echo "XF86VMODE = 1" >> "$i/makefile"
@@ -100,12 +59,11 @@
done
fi
elif [ $OSUNAME = "Linux" ]; then
-@@ -642,23 +654,28 @@
- fi
+@@ -644,22 +651,27 @@
if [ -n "$XINERAMA" ] && [ $XINERAMA -gt 0 ]; then
-+ cflags=""
found=""
++ cflags=""
version=""
pc_package=xinerama
if [ -z "$found" ]; then
@@ -120,20 +78,20 @@
if [ -z "$found" ]; then
if [ -f /usr/X11R6/include/X11/extensions/Xinerama.h ]; then
- found="-I/usr/X11R6/include"
++ found=yes
+ cflags="-I/usr/X11R6/include"
-+ found=yes
elif [ -f /usr/include/X11/extensions/Xinerama.h ]; then
- found="-I/usr/include"
++ found=yes
+ cflags="-I/usr/include"
-+ found=yes
elif [ -f $includedir/X11/extensions/Xinerama.h ]; then
- found="-I$includedir"
++ found=yes
+ cflags="-I$includedir"
-+ found=yes
fi
fi
if [ -n "$found" ]; then
-@@ -671,7 +688,7 @@
+@@ -672,7 +684,7 @@
if [ -n "$MAKEFILE_DIR" ]; then
for i in $MAKEFILE_DIR; do
test -f "$ROOT_DIR/$i/makefile".in && echo "XIN = 1" >> "$i/makefile"
@@ -142,7 +100,7 @@
done
fi
elif [ $OSUNAME = "Linux" ]; then
-@@ -683,12 +700,14 @@
+@@ -684,12 +696,14 @@
if [ -n "$XRANDR" ] && [ $XRANDR -gt 0 ]; then
found=""
@@ -158,7 +116,7 @@
version=`pkg-config --modversion $pc_package`
fi
fi
-@@ -702,7 +721,7 @@
+@@ -703,7 +717,7 @@
if [ -n "$MAKEFILE_DIR" ]; then
for i in $MAKEFILE_DIR; do
test -f "$ROOT_DIR/$i/makefile".in && echo "XRANDR = 1" >> "$i/makefile"
@@ -167,7 +125,7 @@
done
fi
elif [ $OSUNAME = "Linux" ]; then
-@@ -840,22 +859,27 @@
+@@ -841,22 +855,27 @@
fi
if [ -n "$X11" ] && [ $X11 -gt 0 ]; then
found=""
@@ -199,7 +157,7 @@
fi
fi
if [ -n "$found" ]; then
-@@ -868,7 +892,7 @@
+@@ -869,7 +888,7 @@
if [ -n "$MAKEFILE_DIR" ]; then
for i in $MAKEFILE_DIR; do
test -f "$ROOT_DIR/$i/makefile".in && echo "X11 = X11" >> "$i/makefile"
diff --git a/icc_examin-paths.patch b/icc_examin-paths.patch
index 63569d4..06188f9 100644
--- a/icc_examin-paths.patch
+++ b/icc_examin-paths.patch
@@ -1,20 +1,20 @@
---- icc_examin-0.54/icc_gl.cpp.orig 2013-03-31 18:11:39.612986049 +0200
-+++ icc_examin-0.54/icc_gl.cpp 2013-03-31 18:16:23.989646789 +0200
-@@ -871,7 +871,7 @@
+--- icc_examin-0.55/icc_gl.cpp.orig 2014-03-16 18:28:36.436024702 +0100
++++ icc_examin-0.55/icc_gl.cpp 2014-03-16 18:31:13.036018129 +0100
+@@ -865,7 +865,7 @@
if(font) delete font;
if(ortho_font) delete ortho_font;
-- const char* font_name = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
-+ const char* font_name = "/usr/share/fonts/TTF/DejaVuSans.ttf";
+- char * font_name = strdup("/usr/share/fonts/dejavu/DejaVuSans.ttf");
++ char * font_name = strdup("/usr/share/fonts/TTF/DejaVuSans.ttf");
# ifdef HAVE_FONTCONFIG
FcResult r = FcResultMatch;
-@@ -915,7 +915,7 @@
+@@ -909,7 +909,7 @@
# endif
if(!holeDateiModifikationsZeit(font_name)) {
DBG_PROG_S( _("Could not open font in:") << font_name )
-- font_name = "/usr/share/fonts/truetype/DejaVuSans.ttf";
-+ font_name = "/usr/share/fonts/TTF/DejaVuSans.ttf";
+- font_name = strdup("/usr/share/fonts/truetype/DejaVuSans.ttf");
++ font_name = strdup("/usr/share/fonts/TTF/DejaVuSans.ttf");
if(!holeDateiModifikationsZeit(font_name)) {
DBG_PROG_S( _("Could not open font in:") << font_name )
#ifdef WIN32
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/icc_examin.git/commitdiff/a03d4c6b0d05aca75ee2f175b2c0b9e8cfa83fb3
More information about the pld-cvs-commit
mailing list