Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=7de839bdbd243cef2b46dde66ec6312da3563e85
commit 7de839bdbd243cef2b46dde66ec6312da3563e85 Author: Baste <[email protected]> Date: Thu Oct 3 14:48:47 2013 +0200 gtk+2-2.24.21-2-x86_64 * Add proper default theme settings diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild index 0924945..f92fc8b 100644 --- a/source/xlib/gtk+2/FrugalBuild +++ b/source/xlib/gtk+2/FrugalBuild @@ -1,4 +1,4 @@ -# Compiling time: 2.70 SBU +# Compiling time: 6.13 SBU # Maintainer: bouleetbil <[email protected]> options+=('asneeded') @@ -6,10 +6,10 @@ options+=('asneeded') pkgname=gtk+2 _F_gnome_name=gtk+ pkgver=2.24.21 -pkgrel=1 +pkgrel=2 pkgdesc="The GTK+ Toolkit (2.x series)" depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a' 'libtiff' 'libcups>=1.3.11-4' 'gdk-pixbuf2>=2.23.0-5') -rodepends=('gnome-icon-theme' 'shared-mime-info') +rodepends=('gnome-icon-theme' 'shared-mime-info' 'gnome-themes-standard') groups=('xlib') makedepends=('gtk-doc' 'cups' 'inputproto' 'gobject-introspection' 'gnome-common') archs=('i686' 'x86_64' 'arm') @@ -21,9 +21,14 @@ up2date=$pkgver url="http://www.gtk.org/"; _F_cd_path="gtk+-$pkgver" source=($source \ - xid-collision-debug.patch) + xid-collision-debug.patch \ + gtkrc \ + gtkrc.patch +) sha1sums=('1cd78e5848910a95e7b078d9550f005cb70a9cf7' \ - '75c461740e18696a792739cd1f9a20327dbb23bb') + '75c461740e18696a792739cd1f9a20327dbb23bb' \ + 'a11a695c99225a802860ceabaf670101d1aef9dc' \ + '9934fc5a244afb246cddad4fa2931f7778c5e866') subpkgs=("${subpkgs[@]}" "$pkgname-libs") subdescs=("${subdescs[@]}" "GTK+2 core libraries.") @@ -108,7 +113,8 @@ build() { Fsplit $pkgname-demos usr/bin/*-demo* #Fmkdir /etc/gtk-2.0 - echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie + #echo 'gtk-fallback-icon-theme = "gnome"' > $Fdestdir/etc/gtk-2.0/gtkrc || Fdie + Fcp gtkrc usr/share/gtk-2.0/gtkrc Fsplit $pkgname-docs usr/share/gtk-doc } diff --git a/source/xlib/gtk+2/gtkrc b/source/xlib/gtk+2/gtkrc new file mode 100644 index 0000000..ff6207b --- /dev/null +++ b/source/xlib/gtk+2/gtkrc @@ -0,0 +1,6 @@ +gtk-theme-name = "Adwaita" +gtk-icon-theme-name = "gnome" +gtk-cursor-theme-name = "Adwaita" +gtk-button-images = 0 +gtk-menu-images = 0 + diff --git a/source/xlib/gtk+2/gtkrc.patch b/source/xlib/gtk+2/gtkrc.patch new file mode 100644 index 0000000..ed4c2a3 --- /dev/null +++ b/source/xlib/gtk+2/gtkrc.patch @@ -0,0 +1,23 @@ +From 1b8d3b9210c1d2201bb01a748d748f5d17e9eb4f Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <[email protected]> +Date: Mon, 30 Sep 2013 16:50:34 +0000 +Subject: Actually look in /usr/share/gtk-2.0 for default rc files + +I managed to forget the 'share' component of the path. +--- +diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c +index b1f68e2..50b2563 100644 +--- a/gtk/gtkrc.c ++++ b/gtk/gtkrc.c +@@ -525,7 +525,7 @@ gtk_rc_add_initial_default_files (void) + const gchar * const *config_dirs; + const gchar *config_dir; + +- str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL); ++ str = g_build_filename (GTK_DATA_PREFIX, "share", "gtk-2.0", "gtkrc", NULL); + gtk_rc_add_default_file (str); + g_free (str); + +-- +cgit v0.9.2 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
