Date: Friday, May 6, 2016 @ 00:32:17 Author: arojas Revision: 267001 archrelease: copy trunk to extra-i686, extra-x86_64
Added: geeqie/repos/extra-i686/PKGBUILD (from rev 267000, geeqie/trunk/PKGBUILD) geeqie/repos/extra-i686/fix-fullscreen.patch (from rev 267000, geeqie/trunk/fix-fullscreen.patch) geeqie/repos/extra-x86_64/PKGBUILD (from rev 267000, geeqie/trunk/PKGBUILD) geeqie/repos/extra-x86_64/fix-fullscreen.patch (from rev 267000, geeqie/trunk/fix-fullscreen.patch) Deleted: geeqie/repos/extra-i686/PKGBUILD geeqie/repos/extra-i686/fix-fullscreen.patch geeqie/repos/extra-i686/geeqie.install geeqie/repos/extra-x86_64/PKGBUILD geeqie/repos/extra-x86_64/fix-fullscreen.patch geeqie/repos/extra-x86_64/geeqie.install -----------------------------------+ /PKGBUILD | 74 ++++++++++++ /fix-fullscreen.patch | 214 ++++++++++++++++++++++++++++++++++++ extra-i686/PKGBUILD | 38 ------ extra-i686/fix-fullscreen.patch | 107 ------------------ extra-i686/geeqie.install | 11 - extra-x86_64/PKGBUILD | 38 ------ extra-x86_64/fix-fullscreen.patch | 107 ------------------ extra-x86_64/geeqie.install | 11 - 8 files changed, 288 insertions(+), 312 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-05-05 22:31:47 UTC (rev 267000) +++ extra-i686/PKGBUILD 2016-05-05 22:32:17 UTC (rev 267001) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> - -pkgname=geeqie -pkgver=1.2.3 -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' - 'fbida: for jpeg rotation' - 'exiv2: for tiff and png rotation') -install=geeqie.install -source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz - fix-fullscreen.patch) -sha1sums=('d01c971ed5906973ff4788d1f7387563dcdbb0e9' - 'dab15bbda9b329f663276b25bf1989b410596644') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../fix-fullscreen.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh - ./configure --prefix=/usr - make -} - -package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: geeqie/repos/extra-i686/PKGBUILD (from rev 267000, geeqie/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-05-05 22:32:17 UTC (rev 267001) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> + +pkgname=geeqie +pkgver=1.2.3 +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' + 'fbida: for jpeg rotation' + 'exiv2: for tiff and png rotation') +source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz + fix-fullscreen.patch) +sha1sums=('d01c971ed5906973ff4788d1f7387563dcdbb0e9' + 'dab15bbda9b329f663276b25bf1989b410596644') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../fix-fullscreen.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/fix-fullscreen.patch =================================================================== --- extra-i686/fix-fullscreen.patch 2016-05-05 22:31:47 UTC (rev 267000) +++ extra-i686/fix-fullscreen.patch 2016-05-05 22:32:17 UTC (rev 267001) @@ -1,107 +0,0 @@ -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); Copied: geeqie/repos/extra-i686/fix-fullscreen.patch (from rev 267000, geeqie/trunk/fix-fullscreen.patch) =================================================================== --- extra-i686/fix-fullscreen.patch (rev 0) +++ extra-i686/fix-fullscreen.patch 2016-05-05 22:32:17 UTC (rev 267001) @@ -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 2016-05-05 22:31:47 UTC (rev 267000) +++ extra-i686/geeqie.install 2016-05-05 22:32:17 UTC (rev 267001) @@ -1,11 +0,0 @@ -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 2016-05-05 22:31:47 UTC (rev 267000) +++ extra-x86_64/PKGBUILD 2016-05-05 22:32:17 UTC (rev 267001) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> - -pkgname=geeqie -pkgver=1.2.3 -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' - 'fbida: for jpeg rotation' - 'exiv2: for tiff and png rotation') -install=geeqie.install -source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz - fix-fullscreen.patch) -sha1sums=('d01c971ed5906973ff4788d1f7387563dcdbb0e9' - 'dab15bbda9b329f663276b25bf1989b410596644') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../fix-fullscreen.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh - ./configure --prefix=/usr - make -} - -package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: geeqie/repos/extra-x86_64/PKGBUILD (from rev 267000, geeqie/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-05-05 22:32:17 UTC (rev 267001) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> +# Contributor: Lukas Jirkovsky <l.jirkov...@gmail.com> + +pkgname=geeqie +pkgver=1.2.3 +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' + 'fbida: for jpeg rotation' + 'exiv2: for tiff and png rotation') +source=(http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz + fix-fullscreen.patch) +sha1sums=('d01c971ed5906973ff4788d1f7387563dcdbb0e9' + 'dab15bbda9b329f663276b25bf1989b410596644') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../fix-fullscreen.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-x86_64/fix-fullscreen.patch =================================================================== --- extra-x86_64/fix-fullscreen.patch 2016-05-05 22:31:47 UTC (rev 267000) +++ extra-x86_64/fix-fullscreen.patch 2016-05-05 22:32:17 UTC (rev 267001) @@ -1,107 +0,0 @@ -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); Copied: geeqie/repos/extra-x86_64/fix-fullscreen.patch (from rev 267000, geeqie/trunk/fix-fullscreen.patch) =================================================================== --- extra-x86_64/fix-fullscreen.patch (rev 0) +++ extra-x86_64/fix-fullscreen.patch 2016-05-05 22:32:17 UTC (rev 267001) @@ -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 2016-05-05 22:31:47 UTC (rev 267000) +++ extra-x86_64/geeqie.install 2016-05-05 22:32:17 UTC (rev 267001) @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -}