gthumb: aggiunti i file install.

diff --git a/packages/mingw-w64-gthumb/001-win.patch b/packages/mingw-w64-gthumb/001-win.patch
index 487f5962e30d99c4ec49d78a4d0dbdfa8050013a..9aeb9b4b2df8287704be35e55aca2ba0c15b8a33 100644 (file)
--- a/packages/mingw-w64-gthumb/001-win.patch
+++ b/packages/mingw-w64-gthumb/001-win.patch
@@ -1,5 +1,5 @@
---- ./configure.ac.orig        2015-02-09 19:39:15.000000000 +0100
-+++ ./configure.ac     2015-02-15 17:36:19.244980600 +0100
+--- ./configure.ac.orig        2015-03-30 22:08:32.000000000 +0200
++++ ./configure.ac     2015-04-05 12:41:32.146170800 +0200
 @@ -137,7 +137,6 @@
        glib-2.0                >= $GLIB_REQUIRED
        gthread-2.0
@@ -8,8 +8,8 @@
        gtk+-3.0                >= $GTK_REQUIRED
        libpng
        zlib
---- ./extensions/comments/main.c.orig  2015-02-09 19:39:15.000000000 +0100
-+++ ./extensions/comments/main.c       2015-02-15 17:36:19.349986600 +0100
+--- ./extensions/comments/main.c.orig  2015-03-30 22:08:32.000000000 +0200
++++ ./extensions/comments/main.c       2015-04-05 12:41:32.153172100 +0200
 @@ -112,7 +112,9 @@
                         * embedded metadata. */
                        if (g_file_info_get_attribute_boolean (file_data->info, "comment::no-comment-file")) {
@@ -20,15 +20,9 @@
                                        gth_comment_update_from_general_attributes (file_data);
                                }
                        }
---- ./extensions/comments/Makefile.am.orig     2015-02-09 19:39:15.000000000 +0100
-+++ ./extensions/comments/Makefile.am  2015-02-15 17:36:19.356986700 +0100
-@@ -19,11 +19,12 @@
-       main.c                                  \
-       preferences.h
- 
--libcomments_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
-+libcomments_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb
- libcomments_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
+--- ./extensions/comments/Makefile.am.orig     2015-03-30 22:08:32.000000000 +0200
++++ ./extensions/comments/Makefile.am  2015-04-05 12:41:32.159171800 +0200
+@@ -24,6 +24,7 @@
  libcomments_la_LIBADD = $(GTHUMB_LIBS)
  if ENABLE_EXIV2
  libcomments_la_LIBADD += ../exiv2_tools/libexiv2_tools.la
@@ -36,41 +30,41 @@
  endif 
  libcomments_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
  
---- ./extensions/image_print/Makefile.am.orig  2015-02-09 19:39:15.000000000 +0100
-+++ ./extensions/image_print/Makefile.am       2015-02-15 17:47:21.106042400 +0100
-@@ -4,6 +4,10 @@
- extension_LTLIBRARIES = libimage_print.la
- 
- libimage_print_la_SOURCES =           \
-+      ../image_viewer/actions.c \
-+      ../image_viewer/actions.h \
-+      ../image_viewer/gth-image-viewer-page.c \
-+      ../image_viewer/gth-image-viewer-page.h \
-       actions.c                       \
-       actions.h                       \
-       callbacks.c                     \
---- ./gthumb/gnome-desktop-thumbnail.c.orig    2015-02-09 19:39:15.000000000 +0100
-+++ ./gthumb/gnome-desktop-thumbnail.c 2015-02-15 17:36:19.380994200 +0100
-@@ -1370,7 +1370,7 @@
-     }
-   close (tmp_fd);
- 
--  g_snprintf (mtime_str, 21, "%ld",  original_mtime);
-+  g_snprintf (mtime_str, 21, "%ld", (long int)original_mtime);
-   width = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Width");
-   height = gdk_pixbuf_get_option (thumbnail, "tEXt::Thumb::Image::Height");
+--- ./extensions/image_print/Makefile.am.orig  2015-03-30 22:08:32.000000000 +0200
++++ ./extensions/image_print/Makefile.am       2015-04-05 12:43:37.071961900 +0200
+@@ -21,6 +21,9 @@
+ libimage_print_la_CPPFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb 
+ libimage_print_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS)
+ libimage_print_la_LIBADD = $(GTHUMB_LIBS) 
++if ENABLE_JPEG_TOOLS
++libimage_print_la_LIBADD += ../image_viewer/libimage_viewer.la
++endif
+ libimage_print_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT)
  
-@@ -1471,7 +1471,7 @@
-     }
-   close (tmp_fd);
+ extensioninidir = $(extensiondir)
+--- ./extensions/Makefile.am.orig      2015-03-30 22:08:32.000000000 +0200
++++ ./extensions/Makefile.am   2015-04-05 12:41:32.185174100 +0200
+@@ -26,7 +26,6 @@
+ JPEG_TOOLS =                  \
+       cairo_io                \
+       image_rotation          \
+-      image_viewer            \
+       importer                \
+       $(NULL)
  
--  g_snprintf (mtime_str, 21, "%ld",  mtime);
-+  g_snprintf (mtime_str, 21, "%ld", (long int)mtime);
-   pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, 1, 1);
-   saved_ok  = gdk_pixbuf_save (pixbuf,
-                              tmp_path,
---- ./gthumb/gth-thumb-loader.c.orig   2015-02-09 19:39:15.000000000 +0100
-+++ ./gthumb/gth-thumb-loader.c        2015-02-15 17:36:19.392988700 +0100
+@@ -49,8 +48,9 @@
+       file_viewer             \
+       gstreamer_utils         \
+       gstreamer_tools         \
+-      image_print             \
+       jpeg_utils              \
++      image_viewer            \
++      image_print             \
+       $(JPEG_TOOLS)           \
+       list_tools              \
+       map_view                \
+--- ./gthumb/gth-thumb-loader.c.orig   2015-03-30 22:08:32.000000000 +0200
++++ ./gthumb/gth-thumb-loader.c        2015-04-05 12:41:32.193174000 +0200
 @@ -44,6 +44,10 @@
  #include "pixbuf-utils.h"
  #include "typedefs.h"
@@ -94,8 +88,8 @@
  
        return FALSE;
  }
---- ./gthumb/gth-time-selector.c.orig  2015-02-09 19:39:15.000000000 +0100
-+++ ./gthumb/gth-time-selector.c       2015-02-15 17:36:19.402989400 +0100
+--- ./gthumb/gth-time-selector.c.orig  2015-03-30 22:08:32.000000000 +0200
++++ ./gthumb/gth-time-selector.c       2015-04-05 12:41:32.201173800 +0200
 @@ -312,7 +312,7 @@
  static void
  update_date_from_view (GthTimeSelector *self)
@@ -114,8 +108,8 @@
  }
  
  
---- ./gthumb/main-migrate-catalogs.c.orig      2015-02-09 19:39:15.000000000 +0100
-+++ ./gthumb/main-migrate-catalogs.c   2015-02-15 17:36:19.410990000 +0100
+--- ./gthumb/main-migrate-catalogs.c.orig      2015-03-30 22:08:32.000000000 +0200
++++ ./gthumb/main-migrate-catalogs.c   2015-04-05 12:41:32.208175500 +0200
 @@ -300,7 +300,7 @@
                                /* line 8: date */
  
@@ -125,8 +119,8 @@
  
                                /* line 9: date scope */
  
---- ./gthumb/main.c.orig       2015-02-09 19:39:15.000000000 +0100
-+++ ./gthumb/main.c    2015-02-15 17:36:19.420989600 +0100
+--- ./gthumb/main.c.orig       2015-03-30 22:08:32.000000000 +0200
++++ ./gthumb/main.c    2015-04-05 12:41:32.220175600 +0200
 @@ -23,7 +23,9 @@
  #include <glib/gi18n.h>
  #include <glib/gprintf.h>
@@ -137,3 +131,69 @@
  #ifdef HAVE_GSTREAMER
  #  include <gst/gst.h>
  #endif
+--- ./m4/intltool.m4.orig      2015-03-30 22:09:03.000000000 +0200
++++ ./m4/intltool.m4   2015-04-05 12:41:32.227175800 +0200
+@@ -155,31 +155,6 @@
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+ 
+-# Set DATADIRNAME correctly if it is not set yet
+-# (copied from glib-gettext.m4)
+-if test -z "$DATADIRNAME"; then
+-  AC_LINK_IFELSE(
+-    [AC_LANG_PROGRAM([[]],
+-                     [[extern int _nl_msg_cat_cntr;
+-                       return _nl_msg_cat_cntr]])],
+-    [DATADIRNAME=share],
+-    [case $host in
+-    *-*-solaris*)
+-    dnl On Solaris, if bind_textdomain_codeset is in libc,
+-    dnl GNU format message catalog is always supported,
+-    dnl since both are added to the libc all together.
+-    dnl Hence, we'd like to go with DATADIRNAME=share
+-    dnl in this case.
+-    AC_CHECK_FUNC(bind_textdomain_codeset,
+-      [DATADIRNAME=share], [DATADIRNAME=lib])
+-    ;;
+-    *)
+-    [DATADIRNAME=lib]
+-    ;;
+-    esac])
+-fi
+-AC_SUBST(DATADIRNAME)
+-
+ IT_PO_SUBDIR([po])
+ 
+ ])
+--- ./po/Makefile.in.in.orig   2015-03-30 22:09:03.000000000 +0200
++++ ./po/Makefile.in.in        2015-04-05 12:41:32.234175900 +0200
+@@ -33,8 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
+-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
++localedir = @localedir@
+ subdir = po
+ install_sh = @install_sh@
+ # Automake >= 1.8 provides @mkdir_p@.
+@@ -108,7 +107,7 @@
+ install-data-yes: all
+       linguas="$(USE_LINGUAS)"; \
+       for lang in $$linguas; do \
+-        dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
++        dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkdir_p) $$dir; \
+         if test -r $$lang.gmo; then \
+           $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+@@ -142,8 +141,8 @@
+ uninstall:
+       linguas="$(USE_LINGUAS)"; \
+       for lang in $$linguas; do \
+-        rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+-        rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
++        rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
++        rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+       done
+ 
+ check: all $(GETTEXT_PACKAGE).pot

diff --git a/packages/mingw-w64-gthumb/PKGBUILD b/packages/mingw-w64-gthumb/PKGBUILD
index dfe568b5b12d8c806b1d2ad037892b79432b3e5a..8534bff991163a4b139daaec24f4dc395d7817df 100644 (file)
--- a/packages/mingw-w64-gthumb/PKGBUILD
+++ b/packages/mingw-w64-gthumb/PKGBUILD
@@ -9,13 +9,11 @@ pkgdesc="An image viewer and browser (mingw-w64)"
 options=(strip staticlibs)
 depends=("${MINGW_PACKAGE_PREFIX}-gtk3"
          "${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme"
-         "${MINGW_PACKAGE_PREFIX}-exiv2"
          "${MINGW_PACKAGE_PREFIX}-clutter"
          "${MINGW_PACKAGE_PREFIX}-clutter-gtk"
          "${MINGW_PACKAGE_PREFIX}-LibRaw"
          "${MINGW_PACKAGE_PREFIX}-libsoup"
          "${MINGW_PACKAGE_PREFIX}-libchamplain"
-         "${MINGW_PACKAGE_PREFIX}-gstreamer0.10"
          "${MINGW_PACKAGE_PREFIX}-librsvg"
          "${MINGW_PACKAGE_PREFIX}-libwebp"
          "${MINGW_PACKAGE_PREFIX}-json-glib"
@@ -24,10 +22,11 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-pkg-config")
 license=("GPL 2")
 url="http://www.gnome.org"
+install=${_realname}-${CARCH}.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-$pkgver.tar.xz
         001-win.patch)
 sha256sums=('657812b998d8b700ed3f6d9c8612adad22cff0e56383e5e01a61738b32dfec3b'
-            '747ae3f38beb4dfa9f3bbf8cbe0e566f2b1b6d1c76650ca71b41cff31ff3faea')
+            '29bd41e9865d876ad290ced8cb98033769db213c8d25d0df9f2b8de569265535')
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}

diff --git a/packages/mingw-w64-gthumb/gthumb-i686.install b/packages/mingw-w64-gthumb/gthumb-i686.install
new file mode 100644 (file)
index 0000000..fcc957e
--- /dev/null
+++ b/packages/mingw-w64-gthumb/gthumb-i686.install
@@ -0,0 +1,11 @@
+post_install() {
+  mingw32/bin/glib-compile-schemas mingw32/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

diff --git a/packages/mingw-w64-gthumb/gthumb-x86_64.install b/packages/mingw-w64-gthumb/gthumb-x86_64.install
new file mode 100644 (file)
index 0000000..6bcf507
--- /dev/null
+++ b/packages/mingw-w64-gthumb/gthumb-x86_64.install
@@ -0,0 +1,11 @@
+post_install() {
+  mingw64/bin/glib-compile-schemas mingw64/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}