Date: Sunday, August 16, 2015 @ 09:54:43
Author: bisson
Revision: 243782
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
geeqie/repos/extra-i686/PKGBUILD
(from rev 243781, geeqie/trunk/PKGBUILD)
geeqie/repos/extra-i686/fix-fullscreen.patch
(from rev 243781, geeqie/trunk/fix-fullscreen.patch)
geeqie/repos/extra-i686/geeqie.install
(from rev 243781, geeqie/trunk/geeqie.install)
geeqie/repos/extra-x86_64/PKGBUILD
(from rev 243781, geeqie/trunk/PKGBUILD)
geeqie/repos/extra-x86_64/fix-fullscreen.patch
(from rev 243781, geeqie/trunk/fix-fullscreen.patch)
geeqie/repos/extra-x86_64/geeqie.install
(from rev 243781, geeqie/trunk/geeqie.install)
Deleted:
geeqie/repos/extra-i686/PKGBUILD
geeqie/repos/extra-i686/geeqie.install
geeqie/repos/extra-x86_64/PKGBUILD
geeqie/repos/extra-x86_64/geeqie.install
-----------------------------------+
/PKGBUILD | 70 +++++++++++++++++++++++
/geeqie.install | 22 +++++++
extra-i686/PKGBUILD | 28 ---------
extra-i686/fix-fullscreen.patch | 107 ++++++++++++++++++++++++++++++++++++
extra-i686/geeqie.install | 11 ---
extra-x86_64/PKGBUILD | 28 ---------
extra-x86_64/fix-fullscreen.patch | 107 ++++++++++++++++++++++++++++++++++++
extra-x86_64/geeqie.install | 11 ---
8 files changed, 306 insertions(+), 78 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-08-16 07:54:10 UTC (rev 243781)
+++ extra-i686/PKGBUILD 2015-08-16 07:54:43 UTC (rev 243782)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <[email protected]>
-# Contributor: Lukas Jirkovsky <[email protected]>
-
-pkgname=geeqie
-pkgver=1.2
-pkgrel=1
-pkgdesc="A lightweight image browser and viewer"
-arch=('i686' 'x86_64')
-url="http://www.geeqie.org/";
-license=('GPL2')
-depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
-makedepends=('intltool' 'doxygen' 'gnome-doc-utils' 'git')
-optdepends=('librsvg: SVG rendering')
-install=geeqie.install
-source=('git://www.geeqie.org/geeqie.git#commit=ca42d65be013f9bcded858b656c594d45c7f8e1d')
-sha1sums=('SKIP')
-
-build() {
- cd "${srcdir}/${pkgname}"
- ./autogen.sh --prefix=/usr
- make
-}
-
-package(){
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" install
-}
Copied: geeqie/repos/extra-i686/PKGBUILD (from rev 243781,
geeqie/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-08-16 07:54:43 UTC (rev 243782)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Eric Bélanger <[email protected]>
+# Contributor: Lukas Jirkovsky <[email protected]>
+
+pkgname=geeqie
+pkgver=1.2
+pkgrel=2
+pkgdesc="A lightweight image browser and viewer"
+arch=('i686' 'x86_64')
+url="http://www.geeqie.org/";
+license=('GPL2')
+depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
+makedepends=('intltool' 'doxygen' 'gnome-doc-utils' 'git')
+optdepends=('librsvg: SVG rendering')
+install=geeqie.install
+source=('git://www.geeqie.org/geeqie.git#commit=ca42d65be013f9bcded858b656c594d45c7f8e1d'
+ 'fix-fullscreen.patch')
+sha1sums=('SKIP'
+ 'dab15bbda9b329f663276b25bf1989b410596644')
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+ patch -p1 -i ../fix-fullscreen.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package(){
+ cd "${srcdir}/${pkgname}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: geeqie/repos/extra-i686/fix-fullscreen.patch (from rev 243781,
geeqie/trunk/fix-fullscreen.patch)
===================================================================
--- extra-i686/fix-fullscreen.patch (rev 0)
+++ extra-i686/fix-fullscreen.patch 2015-08-16 07:54:43 UTC (rev 243782)
@@ -0,0 +1,107 @@
+diff -Naur old/src/fullscreen.c new/src/fullscreen.c
+--- old/src/fullscreen.c 2015-08-16 16:37:58.132952447 +0900
++++ new/src/fullscreen.c 2015-08-16 16:43:30.031882508 +0900
+@@ -210,10 +210,6 @@
+ void (*stop_func)(FullScreenData *, gpointer),
gpointer stop_data)
+ {
+ FullScreenData *fs;
+- GdkScreen *screen;
+- gint x, y;
+- gint w, h;
+- GdkGeometry geometry;
+ GdkWindow *gdkwin;
+
+ if (!window || !imd) return NULL;
+@@ -229,14 +225,9 @@
+ fs->stop_data = stop_data;
+
+ DEBUG_1("full screen requests screen %d", options->fullscreen.screen);
+- fullscreen_prefs_get_geometry(options->fullscreen.screen, window, &x,
&y, &w, &h,
+- &screen, &fs->same_region);
+
+ fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL,
_("Full screen"));
+
+- /* this requests no decorations, if you still have them complain to the
window manager author(s) */
+- gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);
+-
+ if (options->fullscreen.screen < 0)
+ {
+ /* If we want control of the window size and position this is
not what we want.
+@@ -246,9 +237,42 @@
+ }
+ else
+ {
+- gtk_window_set_screen(GTK_WINDOW(fs->window), screen);
++ GdkScreen *screen;
++ gint x, y;
++ gint w, h;
++ GdkGeometry geometry;
++
++ fullscreen_prefs_get_geometry(options->fullscreen.screen,
window, &x, &y, &w, &h,
++ &screen, &fs->same_region);
++
+ if (options->fullscreen.above)
+ gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
++
++ gtk_window_set_screen(GTK_WINDOW(fs->window), screen);
++ gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);
++ gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE);
++ gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0);
++
++ geometry.min_width = w;
++ geometry.min_height = h;
++ geometry.max_width = w;
++ geometry.max_height = h;
++ geometry.base_width = w;
++ geometry.base_height = h;
++ geometry.win_gravity = GDK_GRAVITY_STATIC;
++
++ gtk_window_set_geometry_hints(GTK_WINDOW(fs->window),
fs->window, &geometry,
++ GDK_HINT_MIN_SIZE |
GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE |
++ GDK_HINT_WIN_GRAVITY |
++ GDK_HINT_USER_POS);
++
++ gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h);
++ gtk_window_move(GTK_WINDOW(fs->window), x, y);
++
++ gtk_widget_realize(fs->window);
++ gdkwin = gtk_widget_get_window(fs->window);
++ if (gdkwin != NULL)
++ gdk_window_set_override_redirect(gdkwin, TRUE);
+ }
+
+ gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE);
+@@ -256,33 +280,6 @@
+ g_signal_connect(G_OBJECT(fs->window), "delete_event",
+ G_CALLBACK(fullscreen_delete_cb), fs);
+
+- geometry.min_width = w;
+- geometry.min_height = h;
+- geometry.max_width = w;
+- geometry.max_height = h;
+- geometry.base_width = w;
+- geometry.base_height = h;
+- geometry.win_gravity = GDK_GRAVITY_STATIC;
+- /* By setting USER_POS and USER_SIZE, most window managers will
+- * not request positioning of the full screen window (for example twm).
+- *
+- * In addition, setting gravity to STATIC will result in the
+- * decorations of twm to not effect the requested window position,
+- * the decorations will simply be off screen, except in multi monitor
setups :-/
+- */
+- gtk_window_set_geometry_hints(GTK_WINDOW(fs->window), fs->window,
&geometry,
+- GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE |
GDK_HINT_BASE_SIZE |
+- GDK_HINT_WIN_GRAVITY |
+- GDK_HINT_USER_POS);
+-
+- gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h);
+- gtk_window_move(GTK_WINDOW(fs->window), x, y);
+-
+- gtk_widget_realize(fs->window);
+- gdkwin = gtk_widget_get_window(fs->window);
+- if (gdkwin != NULL)
+- gdk_window_set_override_redirect(gdkwin, TRUE);
+-
+ fs->imd = image_new(FALSE);
+
+ gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget);
Deleted: extra-i686/geeqie.install
===================================================================
--- extra-i686/geeqie.install 2015-08-16 07:54:10 UTC (rev 243781)
+++ extra-i686/geeqie.install 2015-08-16 07:54:43 UTC (rev 243782)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: geeqie/repos/extra-i686/geeqie.install (from rev 243781,
geeqie/trunk/geeqie.install)
===================================================================
--- extra-i686/geeqie.install (rev 0)
+++ extra-i686/geeqie.install 2015-08-16 07:54:43 UTC (rev 243782)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-08-16 07:54:10 UTC (rev 243781)
+++ extra-x86_64/PKGBUILD 2015-08-16 07:54:43 UTC (rev 243782)
@@ -1,28 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <[email protected]>
-# Contributor: Lukas Jirkovsky <[email protected]>
-
-pkgname=geeqie
-pkgver=1.2
-pkgrel=1
-pkgdesc="A lightweight image browser and viewer"
-arch=('i686' 'x86_64')
-url="http://www.geeqie.org/";
-license=('GPL2')
-depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
-makedepends=('intltool' 'doxygen' 'gnome-doc-utils' 'git')
-optdepends=('librsvg: SVG rendering')
-install=geeqie.install
-source=('git://www.geeqie.org/geeqie.git#commit=ca42d65be013f9bcded858b656c594d45c7f8e1d')
-sha1sums=('SKIP')
-
-build() {
- cd "${srcdir}/${pkgname}"
- ./autogen.sh --prefix=/usr
- make
-}
-
-package(){
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" install
-}
Copied: geeqie/repos/extra-x86_64/PKGBUILD (from rev 243781,
geeqie/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-08-16 07:54:43 UTC (rev 243782)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Eric Bélanger <[email protected]>
+# Contributor: Lukas Jirkovsky <[email protected]>
+
+pkgname=geeqie
+pkgver=1.2
+pkgrel=2
+pkgdesc="A lightweight image browser and viewer"
+arch=('i686' 'x86_64')
+url="http://www.geeqie.org/";
+license=('GPL2')
+depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
+makedepends=('intltool' 'doxygen' 'gnome-doc-utils' 'git')
+optdepends=('librsvg: SVG rendering')
+install=geeqie.install
+source=('git://www.geeqie.org/geeqie.git#commit=ca42d65be013f9bcded858b656c594d45c7f8e1d'
+ 'fix-fullscreen.patch')
+sha1sums=('SKIP'
+ 'dab15bbda9b329f663276b25bf1989b410596644')
+
+prepare() {
+ cd "${srcdir}/${pkgname}"
+ patch -p1 -i ../fix-fullscreen.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package(){
+ cd "${srcdir}/${pkgname}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: geeqie/repos/extra-x86_64/fix-fullscreen.patch (from rev 243781,
geeqie/trunk/fix-fullscreen.patch)
===================================================================
--- extra-x86_64/fix-fullscreen.patch (rev 0)
+++ extra-x86_64/fix-fullscreen.patch 2015-08-16 07:54:43 UTC (rev 243782)
@@ -0,0 +1,107 @@
+diff -Naur old/src/fullscreen.c new/src/fullscreen.c
+--- old/src/fullscreen.c 2015-08-16 16:37:58.132952447 +0900
++++ new/src/fullscreen.c 2015-08-16 16:43:30.031882508 +0900
+@@ -210,10 +210,6 @@
+ void (*stop_func)(FullScreenData *, gpointer),
gpointer stop_data)
+ {
+ FullScreenData *fs;
+- GdkScreen *screen;
+- gint x, y;
+- gint w, h;
+- GdkGeometry geometry;
+ GdkWindow *gdkwin;
+
+ if (!window || !imd) return NULL;
+@@ -229,14 +225,9 @@
+ fs->stop_data = stop_data;
+
+ DEBUG_1("full screen requests screen %d", options->fullscreen.screen);
+- fullscreen_prefs_get_geometry(options->fullscreen.screen, window, &x,
&y, &w, &h,
+- &screen, &fs->same_region);
+
+ fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL,
_("Full screen"));
+
+- /* this requests no decorations, if you still have them complain to the
window manager author(s) */
+- gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);
+-
+ if (options->fullscreen.screen < 0)
+ {
+ /* If we want control of the window size and position this is
not what we want.
+@@ -246,9 +237,42 @@
+ }
+ else
+ {
+- gtk_window_set_screen(GTK_WINDOW(fs->window), screen);
++ GdkScreen *screen;
++ gint x, y;
++ gint w, h;
++ GdkGeometry geometry;
++
++ fullscreen_prefs_get_geometry(options->fullscreen.screen,
window, &x, &y, &w, &h,
++ &screen, &fs->same_region);
++
+ if (options->fullscreen.above)
+ gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE);
++
++ gtk_window_set_screen(GTK_WINDOW(fs->window), screen);
++ gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE);
++ gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE);
++ gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0);
++
++ geometry.min_width = w;
++ geometry.min_height = h;
++ geometry.max_width = w;
++ geometry.max_height = h;
++ geometry.base_width = w;
++ geometry.base_height = h;
++ geometry.win_gravity = GDK_GRAVITY_STATIC;
++
++ gtk_window_set_geometry_hints(GTK_WINDOW(fs->window),
fs->window, &geometry,
++ GDK_HINT_MIN_SIZE |
GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE |
++ GDK_HINT_WIN_GRAVITY |
++ GDK_HINT_USER_POS);
++
++ gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h);
++ gtk_window_move(GTK_WINDOW(fs->window), x, y);
++
++ gtk_widget_realize(fs->window);
++ gdkwin = gtk_widget_get_window(fs->window);
++ if (gdkwin != NULL)
++ gdk_window_set_override_redirect(gdkwin, TRUE);
+ }
+
+ gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE);
+@@ -256,33 +280,6 @@
+ g_signal_connect(G_OBJECT(fs->window), "delete_event",
+ G_CALLBACK(fullscreen_delete_cb), fs);
+
+- geometry.min_width = w;
+- geometry.min_height = h;
+- geometry.max_width = w;
+- geometry.max_height = h;
+- geometry.base_width = w;
+- geometry.base_height = h;
+- geometry.win_gravity = GDK_GRAVITY_STATIC;
+- /* By setting USER_POS and USER_SIZE, most window managers will
+- * not request positioning of the full screen window (for example twm).
+- *
+- * In addition, setting gravity to STATIC will result in the
+- * decorations of twm to not effect the requested window position,
+- * the decorations will simply be off screen, except in multi monitor
setups :-/
+- */
+- gtk_window_set_geometry_hints(GTK_WINDOW(fs->window), fs->window,
&geometry,
+- GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE |
GDK_HINT_BASE_SIZE |
+- GDK_HINT_WIN_GRAVITY |
+- GDK_HINT_USER_POS);
+-
+- gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h);
+- gtk_window_move(GTK_WINDOW(fs->window), x, y);
+-
+- gtk_widget_realize(fs->window);
+- gdkwin = gtk_widget_get_window(fs->window);
+- if (gdkwin != NULL)
+- gdk_window_set_override_redirect(gdkwin, TRUE);
+-
+ fs->imd = image_new(FALSE);
+
+ gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget);
Deleted: extra-x86_64/geeqie.install
===================================================================
--- extra-x86_64/geeqie.install 2015-08-16 07:54:10 UTC (rev 243781)
+++ extra-x86_64/geeqie.install 2015-08-16 07:54:43 UTC (rev 243782)
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: geeqie/repos/extra-x86_64/geeqie.install (from rev 243781,
geeqie/trunk/geeqie.install)
===================================================================
--- extra-x86_64/geeqie.install (rev 0)
+++ extra-x86_64/geeqie.install 2015-08-16 07:54:43 UTC (rev 243782)
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
