From 290268ba441e97ba0be367f298777f4ea86ac288 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Tue, 19 Nov 2013 22:27:26 +0100 Subject: [PATCH] kde-gtk-config patch added http://quickgit.kde.org/?p=kde-gtk-config.git&a=commit&h=f47a8380c76f42d7807fcd1e5bf82a540faa8d84 --- kde-gtk-config/PKGBUILD | 15 ++++-- .../appearancegtk_consistent_fix.patch | 47 +++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 kde-gtk-config/appearancegtk_consistent_fix.patch diff --git a/kde-gtk-config/PKGBUILD b/kde-gtk-config/PKGBUILD index d3a5711e8..f837e01e6 100644 --- a/kde-gtk-config/PKGBUILD +++ b/kde-gtk-config/PKGBUILD @@ -2,7 +2,7 @@ pkgname=kde-gtk-config pkgver=2.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A KCM for Configuring the GTK2 and GTK3 look&feel" arch=('x86_64') url="https://projects.kde.org/projects/kdereview/kde-gtk-config" @@ -15,9 +15,18 @@ conflicts=('kde-gtk-config-git' 'chakra-gtk-config' 'chakra-gtk-config-git') provides=('chakra-gtk-config') replaces=('chakra-gtk-config') groups=('gtk-integration') -source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz") +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz" + appearancegtk_consistent_fix.patch) install=$pkgname.install -md5sums=('d155ed431d509e54a60383a70b700e1c') +md5sums=('d155ed431d509e54a60383a70b700e1c' + 'd843bdd4fb14621d4b79e709446c2f1f') + +prepare(){ + cd $pkgbase-$pkgver + + # fix: Be consistent regarding the loading and saving of the boolean properties + patch -Np1 -i ${srcdir}/appearancegtk_consistent_fix.patch +} build() { cd "$srcdir" diff --git a/kde-gtk-config/appearancegtk_consistent_fix.patch b/kde-gtk-config/appearancegtk_consistent_fix.patch new file mode 100644 index 000000000..c6cf157fe --- /dev/null +++ b/kde-gtk-config/appearancegtk_consistent_fix.patch @@ -0,0 +1,47 @@ +From: Aleix Pol +Date: Fri, 22 Mar 2013 13:31:13 +0000 +Subject: Be consistent regarding the loading and saving of the boolean properties +X-Git-Url: http://quickgit.kde.org/?p=kde-gtk-config.git&a=commitdiff&h=f47a8380c76f42d7807fcd1e5bf82a540faa8d84 +--- +Be consistent regarding the loading and saving of the boolean properties +--- + + +--- a/src/appearancegtk2.cpp ++++ b/src/appearancegtk2.cpp +@@ -108,8 +108,8 @@ + flow << "gtk-icon-theme-name=\""<< m_settings["icon"] << "\"\n"; + flow << "gtk-fallback-icon-theme=\"" << m_settings["icon_fallback"] << "\"\n"; + flow << "gtk-toolbar-style=" << m_settings["toolbar_style"] << "\n"; +- flow << "gtk-menu-images=" << m_settings["show_icons_buttons"] << "\n"; +- flow << "gtk-button-images=" << m_settings["show_icons_menus"] << "\n"; ++ flow << "gtk-menu-images=" << m_settings["show_icons_menus"] << "\n"; ++ flow << "gtk-button-images=" << m_settings["show_icons_buttons"] << "\n"; + + //we're done with the ~/.gtk-2.0 file + gtkrc.close(); + +--- a/src/appearancegtk3.cpp ++++ b/src/appearancegtk3.cpp +@@ -61,7 +61,6 @@ + kDebug() << "Couldn't open GTK3 config file for writing at:" << file_gtk3.fileName(); + return false; + } +- + QTextStream flow3(&file_gtk3); + flow3 << "[Settings]\n"; + flow3 << "gtk-font-name=" << m_settings["font"] << "\n"; +@@ -69,9 +68,8 @@ + flow3 << "gtk-icon-theme-name="<< m_settings["icon"] << "\n"; + flow3 << "gtk-fallback-icon-theme=" << m_settings["icon_fallback"] << "\n"; + flow3 << "gtk-toolbar-style=" << m_settings["toolbar_style"] << "\n"; +- flow3 << "gtk-menu-images=" << m_settings["show_icons_buttons"] << "\n"; +- flow3 << "gtk-button-images=" << m_settings["show_icons_menus"] << "\n"; +- ++ flow3 << "gtk-menu-images=" << m_settings["show_icons_menus"] << "\n"; ++ flow3 << "gtk-button-images=" << m_settings["show_icons_buttons"] << "\n"; + return true; + } + + +