wok-next rev 20117
libgtkimageview: add debian patches
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Oct 30 22:23:08 2017 +0100 (2017-10-30) |
| parents | 2014b0aa3b15 |
| children | 7a0eced4cc40 |
| files | gogglesmm/receipt libgtkimageview-dev/receipt libgtkimageview/receipt libgtkimageview/stuff/patches/gcc6.patch libgtkimageview/stuff/patches/resource.patch libgtkimageview/stuff/patches/series |
line diff
1.1 --- a/gogglesmm/receipt Mon Oct 30 17:57:51 2017 +0100 1.2 +++ b/gogglesmm/receipt Mon Oct 30 22:23:08 2017 +0100 1.3 @@ -14,12 +14,12 @@ 1.4 mesa libglu-mesa" 1.5 BUILD_DEPENDS="fox-dev sqlite3 taglib dbus-dev xine-lib-dev \ 1.6 sqlite3-dev taglib-dev curl-dev expat-dev xorg-xproto \ 1.7 -xorg-libX11-dev libgcrypt-dev mesa-dev pkg-config" 1.8 +xorg-libX11-dev libgcrypt-dev mesa-dev libglu-mesa-dev pkg-config" 1.9 1.10 # Rules to configure and make the package. 1.11 compile_rules() 1.12 { 1.13 - cd $src 1.14 + sed -i 's/0x80/-128/g' src/gmutils.cpp 1.15 # Fixed installing .mo files since busybox install commmand 1.16 # doesn't have -T option 1.17 sed -i 's| -T||g' $src/Makefile
2.1 --- a/libgtkimageview-dev/receipt Mon Oct 30 17:57:51 2017 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,24 +0,0 @@ 2.4 -# SliTaz package receipt. 2.5 - 2.6 -PACKAGE="libgtkimageview-dev" 2.7 -VERSION="1.6.4" 2.8 -CATEGORY="development" 2.9 -SHORT_DESC="Simple image viewer widget for GTK devel files." 2.10 -SOURCE="gtkimageview" 2.11 -MAINTAINER="gokhlayeh@slitaz.org" 2.12 -LICENSE="LGPL2.1" 2.13 -WANTED="libgtkimageview" 2.14 -WEB_SITE="http://trac.bjourne.webfactional.com/" 2.15 - 2.16 -DEPENDS="pkg-config" 2.17 - 2.18 -# Rules to gen a SliTaz package suitable for Tazpkg. 2.19 -genpkg_rules() 2.20 -{ 2.21 - mkdir -p $fs/usr 2.22 - cp -a $install/usr/include $fs/usr 2.23 - cp -a $install/usr/lib $fs/usr 2.24 - # Remove libraries files 2.25 - cd $fs/usr/lib 2.26 - rm -r *.so* 2.27 -}
3.1 --- a/libgtkimageview/receipt Mon Oct 30 17:57:51 2017 +0100 3.2 +++ b/libgtkimageview/receipt Mon Oct 30 22:23:08 2017 +0100 3.3 @@ -1,4 +1,4 @@ 3.4 -# SliTaz package receipt. 3.5 +# SliTaz package receipt v2. 3.6 3.7 PACKAGE="libgtkimageview" 3.8 VERSION="1.6.4" 3.9 @@ -11,13 +11,12 @@ 3.10 WEB_SITE="http://trac.bjourne.webfactional.com/" 3.11 WGET_URL="http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/$TARBALL?format=raw" 3.12 3.13 -DEPENDS="gtk+" 3.14 BUILD_DEPENDS="gtk+-dev expat-dev" 3.15 +SPLIT="libgtkimageview libgtkimageview-dev" 3.16 3.17 # Rules to configure and make the package. 3.18 compile_rules() 3.19 { 3.20 - cd $src 3.21 ./configure \ 3.22 --prefix=/usr \ 3.23 --infodir=/usr/share/info \ 3.24 @@ -29,9 +28,24 @@ 3.25 # Rules to gen a SliTaz package suitable for Tazpkg. 3.26 genpkg_rules() 3.27 { 3.28 - mkdir -p $fs/usr 3.29 - cp -a $install/usr/lib $fs/usr 3.30 - # Remove devel files 3.31 - cd $fs/usr/lib 3.32 - rm -r libgtkimageview.a libgtkimageview.la pkgconfig/ 3.33 + case $PACKAGE in 3.34 + libgtkimageview) 3.35 + DEPENDS="gtk+" 3.36 + mkdir -p $fs/usr 3.37 + cp -a $install/usr/lib $fs/usr 3.38 + # Remove devel files 3.39 + cd $fs/usr/lib 3.40 + rm -r libgtkimageview.a libgtkimageview.la pkgconfig/ 3.41 + ;; 3.42 + libgtkimageview-dev) 3.43 + CAT="development|Simple image viewer widget for GTK devel files." 3.44 + DEPENDS="pkg-config" 3.45 + mkdir -p $fs/usr 3.46 + cp -a $install/usr/include $fs/usr 3.47 + cp -a $install/usr/lib $fs/usr 3.48 + # Remove libraries files 3.49 + cd $fs/usr/lib 3.50 + rm -r *.so* 3.51 + ;; 3.52 + esac 3.53 }
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/libgtkimageview/stuff/patches/gcc6.patch Mon Oct 30 22:23:08 2017 +0100 4.3 @@ -0,0 +1,18 @@ 4.4 +Description: Fix indentation to allow building with GCC 6. 4.5 +Author: Johannes Brandstätter <jbrandst@2ds.eu> 4.6 +Bug-Debian: https://bugs.debian.org/831117 4.7 +Last-Update: <2016-09-24> 4.8 + 4.9 +--- gtkimageview-1.6.4+dfsg.orig/src/gtkimagenav.c 4.10 ++++ gtkimageview-1.6.4+dfsg/src/gtkimagenav.c 4.11 +@@ -71,8 +71,8 @@ static Size 4.12 + gtk_image_nav_get_preview_size (GtkImageNav *nav) 4.13 + { 4.14 + GdkPixbuf *pixbuf = gtk_image_view_get_pixbuf (nav->view); 4.15 +- if (!pixbuf) 4.16 +- return (Size){GTK_IMAGE_NAV_MAX_WIDTH, GTK_IMAGE_NAV_MAX_HEIGHT}; 4.17 ++ if (!pixbuf) 4.18 ++ return (Size){GTK_IMAGE_NAV_MAX_WIDTH, GTK_IMAGE_NAV_MAX_HEIGHT}; 4.19 + int img_width = gdk_pixbuf_get_width (pixbuf); 4.20 + int img_height = gdk_pixbuf_get_height (pixbuf); 4.21 +
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/libgtkimageview/stuff/patches/resource.patch Mon Oct 30 22:23:08 2017 +0100 5.3 @@ -0,0 +1,158 @@ 5.4 +Origin: Jeffrey Ratcliffe <jjr@debian.org> 5.5 +Bug-Debian: https://bugs.debian.org/789101 5.6 +Last-Update: 2016-02-24 5.7 +--- a/src/Makefile.am 5.8 ++++ b/src/Makefile.am 5.9 +@@ -87,6 +87,12 @@ 5.10 + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ 5.11 + gtk*.h gdk*.h > $@ 5.12 + 5.13 +-EXTRA_DIST = gtkimageview-marshal.list wscript_build 5.14 ++# Generate the GResource source file for icon files: 5.15 ++resource_file = gtkimageview.gresource.xml 5.16 ++BUILT_SOURCES += gtkimageview-resources.c 5.17 ++gtkimageview-resources.c: $(resource_file) $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(resource_file)) 5.18 ++ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(resource_file) 5.19 ++ 5.20 ++EXTRA_DIST = gtkimageview-marshal.list wscript_build $(resource_file) 5.21 + 5.22 + CLEANFILES = $(BUILT_SOURCES) 5.23 +--- a/src/gtkimageview.gresource.xml 5.24 ++++ b/src/gtkimageview.gresource.xml 5.25 +@@ -0,0 +1,7 @@ 5.26 ++<?xml version="1.0" encoding="UTF-8"?> 5.27 ++<gresources> 5.28 ++ <gresource prefix="/org/gnome/gtkimageview"> 5.29 ++ <file>gtkimageview-nav_button.png</file> 5.30 ++ <file>gtkimageview-nav_button_hc.png</file> 5.31 ++ </gresource> 5.32 ++</gresources> 5.33 +--- a/configure.in 5.34 ++++ b/configure.in 5.35 +@@ -29,6 +29,14 @@ 5.36 + # Check for glib utils 5.37 + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) 5.38 + AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) 5.39 ++AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no) 5.40 ++AC_MSG_CHECKING([glib-compile-resources]) 5.41 ++if test "x$GLIB_COMPILE_RESOURCES" = xno ; then 5.42 ++ GLIB_COMPILE_RESOURCES="" 5.43 ++ AC_MSG_RESULT([cannot be found in PATH.]) 5.44 ++else 5.45 ++ AC_MSG_RESULT([usable.]) 5.46 ++fi 5.47 + 5.48 + # 1.8 introduced the --rebuild-sections and --rebuild-types options to 5.49 + # 1.gtkdoc-scan that we need. 5.50 +--- a/src/gtkimagescrollwin.c 5.51 ++++ b/src/gtkimagescrollwin.c 5.52 +@@ -44,97 +44,6 @@ 5.53 + /*************************************************************/ 5.54 + /***** PRIVATE DATA ******************************************/ 5.55 + /*************************************************************/ 5.56 +-#ifdef __GNUC__ 5.57 +-static const guint8 nav_button[] __attribute__ ((__aligned__ (4))) = 5.58 +-#else 5.59 +-static const guint8 nav_button[] = 5.60 +-#endif 5.61 +-{ 5.62 +- "" 5.63 +- /* Pixbuf magic (0x47646b50) */ 5.64 +- "GdkP" 5.65 +- /* length: header (24) + pixel_data (784) */ 5.66 +- "\0\0\3(" 5.67 +- /* pixdata_type (0x1010002) */ 5.68 +- "\1\1\0\2" 5.69 +- /* rowstride (56) */ 5.70 +- "\0\0\0""8" 5.71 +- /* width (14) */ 5.72 +- "\0\0\0\16" 5.73 +- /* height (14) */ 5.74 +- "\0\0\0\16" 5.75 +- /* pixel_data: */ 5.76 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377" 5.77 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.78 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0" 5.79 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.80 +- "\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0" 5.81 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.82 +- "\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.83 +- "\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377" 5.84 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" 5.85 +- "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0" 5.86 +- "\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377" 5.87 +- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" 5.88 +- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" 5.89 +- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" 5.90 +- "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\377\0\0\0\377" 5.91 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0" 5.92 +- "\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\0\0\0\0" 5.93 +- "\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0" 5.94 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" 5.95 +- "\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.96 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" 5.97 +- "\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.98 +- "\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\0\0" 5.99 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.100 +- "\0\0\0\0\0\0\0\0\377\0\0\0\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.101 +- "\0\0\0\0\0" 5.102 +-}; 5.103 +- 5.104 +-#ifdef __GNUC__ 5.105 +-static const guint8 nav_button_hc[] __attribute__ ((__aligned__ (4))) = 5.106 +-#else 5.107 +-static const guint8 nav_button_hc[] = 5.108 +-#endif 5.109 +-{ 5.110 +- "" 5.111 +- /* Pixbuf magic (0x47646b50) */ 5.112 +- "GdkP" 5.113 +- /* length: header (24) + pixel_data (784) */ 5.114 +- "\0\0\3(" 5.115 +- /* pixdata_type (0x1010002) */ 5.116 +- "\1\1\0\2" 5.117 +- /* rowstride (56) */ 5.118 +- "\0\0\0""8" 5.119 +- /* width (14) */ 5.120 +- "\0\0\0\16" 5.121 +- /* height (14) */ 5.122 +- "\0\0\0\16" 5.123 +- /* pixel_data: */ 5.124 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0>>>\377>>>\377\0\0\0" 5.125 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.126 +- "\0\0\0\0\0\0\0>>>\377>>>\377>>>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.127 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0>>>\377>>>\377>>>\377>" 5.128 +- ">>\377>>>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.129 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0>>>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0" 5.130 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0>>>\377\0\0\0\0\0\0\0\0\0\0" 5.131 +- "\0\0>>>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0\0>>>\377\0\0\0\0\0\0\0\0\0\0" 5.132 +- "\0\0>>>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0\0>>>\377>>>\377\0\0\0\0\0\0" 5.133 +- "\0\0\0\0\0\0>>>\377>>>\377\0\0\0\0>>>\377>>>\377>>>\377>>>\377>>>\377" 5.134 +- ">>>\377>>>\377>>>\377>>>\377>>>\377>>>\377>>>\377>>>\377>>>\377>>>\377" 5.135 +- ">>>\377>>>\377>>>\377>>>\377>>>\377>>>\377>>>\377>>>\377>>>\377>>>\377" 5.136 +- ">>>\377>>>\377>>>\377\0\0\0\0>>>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0\0>" 5.137 +- ">>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0\0>>>\377>>>\377\0\0\0\0\0\0\0\0\0" 5.138 +- "\0\0\0>>>\377\0\0\0\0\0\0\0\0\0\0\0\0>>>\377>>>\377\0\0\0\0\0\0\0\0\0" 5.139 +- "\0\0\0>>>\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.140 +- "\0\0\0\0>>>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.141 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0>>>\377>>>\377>>>\377>>>\377>>>\377" 5.142 +- ">>>\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.143 +- "\0\0\0\0\0>>>\377>>>\377>>>\377>>>\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.144 +- "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0>>>\377>>>" 5.145 +- "\377\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" 5.146 +-}; 5.147 + 5.148 + G_DEFINE_TYPE(GtkImageScrollWin, gtk_image_scroll_win, GTK_TYPE_TABLE); 5.149 + 5.150 +@@ -294,9 +203,9 @@ 5.151 + 5.152 + // Setup the navigator button. 5.153 + window->nav_button = 5.154 +- gdk_pixbuf_new_from_inline (-1, nav_button, FALSE, NULL); 5.155 ++ gdk_pixbuf_new_from_resource ("gtkimageview-nav_button.png", NULL); 5.156 + window->nav_button_hc = 5.157 +- gdk_pixbuf_new_from_inline (-1, nav_button_hc, FALSE, NULL); 5.158 ++ gdk_pixbuf_new_from_resource ("gtkimageview-nav_button_hc.png", NULL); 5.159 + window->nav_image = gtk_image_new_from_pixbuf (window->nav_button); 5.160 + 5.161 + window->nav_box = gtk_event_box_new ();