[arch-commits] Commit in xfce4-settings/trunk (3 files)
Date: Thursday, August 22, 2019 @ 06:51:06
Author: foutrelis
Revision: 360550
upgpkg: xfce4-settings 4.14.1-1
New upstream release.
Modified:
xfce4-settings/trunk/PKGBUILD
Deleted:
xfce4-settings/trunk/0001-display-Assure-correct-gchar-Bug-15816.patch
xfce4-settings/trunk/0002-display-Fix-profile-matching-in-xfsettingsd.patch
+
0001-display-Assure-correct-gchar-Bug-15816.patch | 103 ---
0002-display-Fix-profile-matching-in-xfsettingsd.patch | 54 ---
PKGBUILD | 14 --
3 files changed, 3 insertions(+), 168 deletions(-)
Deleted: 0001-display-Assure-correct-gchar-Bug-15816.patch
===
--- 0001-display-Assure-correct-gchar-Bug-15816.patch 2019-08-22 05:52:32 UTC
(rev 360549)
+++ 0001-display-Assure-correct-gchar-Bug-15816.patch 2019-08-22 06:51:06 UTC
(rev 360550)
@@ -1,103 +0,0 @@
-From ae8221b23f72f62276bd0a0ffe129329b217a612 Mon Sep 17 00:00:00 2001
-From: Simon Steinbeiss
-Date: Mon, 19 Aug 2019 18:09:48 +0200
-Subject: [PATCH 1/2] display: Assure correct gchar** (Bug #15816)
-
- common/display-profiles.c | 7 +--
- dialogs/display-settings/main.c | 5 -
- xfsettingsd/displays.c | 6 +-
- 3 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/common/display-profiles.c b/common/display-profiles.c
-index 2265a223..1aab530e 100644
a/common/display-profiles.c
-+++ b/common/display-profiles.c
-@@ -108,7 +108,7 @@ display_settings_get_profiles (gchar **display_infos,
XfconfChannel *channel)
- continue;
- }
-
--profile_name = g_strdup_printf ("%s", *(current_elements+1));
-+profile_name = g_strdup_printf ("%s", *(current_elements + 1));
- g_strfreev (current_elements);
-
- /* Walk through the profile and check if every EDID referenced there
is also currently available */
-@@ -162,11 +162,6 @@ display_settings_get_profiles (gchar **display_infos,
XfconfChannel *channel)
- g_free (profile_name);
- }
-
--for (m = 0; m < noutput; ++m)
--{
--g_free (display_infos[m]);
--}
--g_free (display_infos);
- g_list_free (channel_contents);
- g_hash_table_destroy (properties);
-
-diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
-index bbabfaaa..dc528483 100644
a/dialogs/display-settings/main.c
-+++ b/dialogs/display-settings/main.c
-@@ -1264,12 +1264,13 @@ display_settings_get_display_infos (void)
- gchar **display_infos;
- guint m;
-
--display_infos = g_new0 (gchar *, xfce_randr->noutput);
-+display_infos = g_new0 (gchar *, xfce_randr->noutput + 1);
- /* get all display edids, to only query randr once */
- for (m = 0; m < xfce_randr->noutput; ++m)
- {
- display_infos[m] = g_strdup_printf ("%s", xfce_randr_get_edid
(xfce_randr, m));
- }
-+
- return display_infos;
- }
-
-@@ -1286,6 +1287,7 @@ display_settings_minimal_profile_populate (GtkBuilder
*builder)
-
- display_infos = display_settings_get_display_infos ();
- profiles = display_settings_get_profiles (display_infos, display_channel);
-+g_strfreev (display_infos);
-
- current = g_list_first (profiles);
- while (current)
-@@ -1386,6 +1388,7 @@ display_settings_profile_list_populate (GtkBuilder
*builder)
-
- display_infos = display_settings_get_display_infos ();
- profiles = display_settings_get_profiles (display_infos, display_channel);
-+g_strfreev (display_infos);
-
- /* Populate treeview */
- current = g_list_first (profiles);
-diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
-index 4933ca40..289ff206 100644
a/xfsettingsd/displays.c
-+++ b/xfsettingsd/displays.c
-@@ -444,7 +444,7 @@ xfce_displays_helper_get_display_infos (gint noutput,
- gint m;
- guint8*edid_data;
-
--display_infos = g_new0 (gchar *, noutput);
-+display_infos = g_new0 (gchar *, noutput + 1);
- /* get all display edids, to only query randr once */
- for (m = 0; m < noutput; ++m)
- {
-@@ -452,7 +452,10 @@ xfce_displays_helper_get_display_infos (gint noutput,
-
- if (edid_data)
- display_infos[m] = g_compute_checksum_for_data (G_CHECKSUM_SHA1 ,
edid_data, 128);
-+else
-+display_infos[m] = g_strdup ("");
- }
-+
- return display_infos;
- }
-
-@@ -473,6 +476,7 @@ xfce_displays_helper_get_matching_profile
(XfceDisplaysHelper *helper)
- if (display_infos)
- {
- profiles = display_settings_get_profiles (display_infos,
helper->channel);
-+g_strfreev (display_infos);
- }
-
- if (profiles == NULL)
Deleted: 0002-display-Fix-profile-matching-in-xfsettingsd.patch
===
---
[arch-commits] Commit in xfce4-settings/trunk (3 files)
Date: Monday, August 19, 2019 @ 23:11:54
Author: foutrelis
Revision: 359966
upgpkg: xfce4-settings 4.14.0-2
Apply upstream fix for crashes in multi-monitor setups (FS#63449).
Added:
xfce4-settings/trunk/0001-display-Assure-correct-gchar-Bug-15816.patch
xfce4-settings/trunk/0002-display-Fix-profile-matching-in-xfsettingsd.patch
Modified:
xfce4-settings/trunk/PKGBUILD
+
0001-display-Assure-correct-gchar-Bug-15816.patch | 103 +++
0002-display-Fix-profile-matching-in-xfsettingsd.patch | 54 +++
PKGBUILD | 14 +-
3 files changed, 168 insertions(+), 3 deletions(-)
Added: 0001-display-Assure-correct-gchar-Bug-15816.patch
===
--- 0001-display-Assure-correct-gchar-Bug-15816.patch
(rev 0)
+++ 0001-display-Assure-correct-gchar-Bug-15816.patch 2019-08-19 23:11:54 UTC
(rev 359966)
@@ -0,0 +1,103 @@
+From ae8221b23f72f62276bd0a0ffe129329b217a612 Mon Sep 17 00:00:00 2001
+From: Simon Steinbeiss
+Date: Mon, 19 Aug 2019 18:09:48 +0200
+Subject: [PATCH 1/2] display: Assure correct gchar** (Bug #15816)
+
+---
+ common/display-profiles.c | 7 +--
+ dialogs/display-settings/main.c | 5 -
+ xfsettingsd/displays.c | 6 +-
+ 3 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/common/display-profiles.c b/common/display-profiles.c
+index 2265a223..1aab530e 100644
+--- a/common/display-profiles.c
b/common/display-profiles.c
+@@ -108,7 +108,7 @@ display_settings_get_profiles (gchar **display_infos,
XfconfChannel *channel)
+ continue;
+ }
+
+-profile_name = g_strdup_printf ("%s", *(current_elements+1));
++profile_name = g_strdup_printf ("%s", *(current_elements + 1));
+ g_strfreev (current_elements);
+
+ /* Walk through the profile and check if every EDID referenced there
is also currently available */
+@@ -162,11 +162,6 @@ display_settings_get_profiles (gchar **display_infos,
XfconfChannel *channel)
+ g_free (profile_name);
+ }
+
+-for (m = 0; m < noutput; ++m)
+-{
+-g_free (display_infos[m]);
+-}
+-g_free (display_infos);
+ g_list_free (channel_contents);
+ g_hash_table_destroy (properties);
+
+diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
+index bbabfaaa..dc528483 100644
+--- a/dialogs/display-settings/main.c
b/dialogs/display-settings/main.c
+@@ -1264,12 +1264,13 @@ display_settings_get_display_infos (void)
+ gchar **display_infos;
+ guint m;
+
+-display_infos = g_new0 (gchar *, xfce_randr->noutput);
++display_infos = g_new0 (gchar *, xfce_randr->noutput + 1);
+ /* get all display edids, to only query randr once */
+ for (m = 0; m < xfce_randr->noutput; ++m)
+ {
+ display_infos[m] = g_strdup_printf ("%s", xfce_randr_get_edid
(xfce_randr, m));
+ }
++
+ return display_infos;
+ }
+
+@@ -1286,6 +1287,7 @@ display_settings_minimal_profile_populate (GtkBuilder
*builder)
+
+ display_infos = display_settings_get_display_infos ();
+ profiles = display_settings_get_profiles (display_infos, display_channel);
++g_strfreev (display_infos);
+
+ current = g_list_first (profiles);
+ while (current)
+@@ -1386,6 +1388,7 @@ display_settings_profile_list_populate (GtkBuilder
*builder)
+
+ display_infos = display_settings_get_display_infos ();
+ profiles = display_settings_get_profiles (display_infos, display_channel);
++g_strfreev (display_infos);
+
+ /* Populate treeview */
+ current = g_list_first (profiles);
+diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
+index 4933ca40..289ff206 100644
+--- a/xfsettingsd/displays.c
b/xfsettingsd/displays.c
+@@ -444,7 +444,7 @@ xfce_displays_helper_get_display_infos (gint noutput,
+ gint m;
+ guint8*edid_data;
+
+-display_infos = g_new0 (gchar *, noutput);
++display_infos = g_new0 (gchar *, noutput + 1);
+ /* get all display edids, to only query randr once */
+ for (m = 0; m < noutput; ++m)
+ {
+@@ -452,7 +452,10 @@ xfce_displays_helper_get_display_infos (gint noutput,
+
+ if (edid_data)
+ display_infos[m] = g_compute_checksum_for_data (G_CHECKSUM_SHA1 ,
edid_data, 128);
++else
++display_infos[m] = g_strdup ("");
+ }
++
+ return display_infos;
+ }
+
+@@ -473,6 +476,7 @@ xfce_displays_helper_get_matching_profile
(XfceDisplaysHelper *helper)
+ if (display_infos)
+ {
+ profiles = display_settings_get_profiles (display_infos,
helper->channel);
++g_strfreev (display_infos);
+ }
+
+ if (profiles == NULL)
Added: 0002-display-Fix-profile-matching-in-xfsettingsd.patch
===
---
[arch-commits] Commit in xfce4-settings/trunk (3 files)
Date: Sunday, May 5, 2013 @ 19:49:01
Author: foutrelis
Revision: 184291
upgpkg: xfce4-settings 4.10.1-1
New upstream release.
Modified:
xfce4-settings/trunk/PKGBUILD
Deleted:
xfce4-settings/trunk/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
xfce4-settings/trunk/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
+
PKGBUILD | 21 +--
xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch | 55
--
xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch | 22
3 files changed, 7 insertions(+), 91 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-05 17:47:29 UTC (rev 184290)
+++ PKGBUILD2013-05-05 17:49:01 UTC (rev 184291)
@@ -4,8 +4,8 @@
# Contributor: Corrado Primier ba...@aur.archlinux.org
pkgname=xfce4-settings
-pkgver=4.10.0
-pkgrel=3
+pkgver=4.10.1
+pkgrel=1
pkgdesc=Settings manager for xfce
arch=('i686' 'x86_64')
url=http://www.xfce.org/;
@@ -16,27 +16,20 @@
makedepends=('intltool')
optdepends=('libcanberra: for sound control')
source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
-xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
xfce4-settings-xml-4.10.0.patch)
-sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e'
-'28482a3410d587fe051b84080ab5366b4fbe2af8684ee46384ff899b73d3f349'
-'5be974f8fba6ba9dc14e136762cf752fe46eac99f71511d77d910610b5401244'
+sha256sums=('118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5'
'78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196')
-
-build() {
+prepare() {
cd $srcdir/$pkgname-$pkgver
# enable gnome icon theme, clearlooks theme and font hinting by default
# (taken from Fedora)
patch -Np1 -i $srcdir/xfce4-settings-xml-4.10.0.patch
+}
- # https://bugzilla.xfce.org/show_bug.cgi?id=9272
- patch -Np1 -i $srcdir/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
+build() {
+ cd $srcdir/$pkgname-$pkgver
- # https://bugzilla.xfce.org/show_bug.cgi?id=9273
- patch -Np1 -i
$srcdir/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
-
./configure \
--prefix=/usr \
--sysconfdir=/etc \
Deleted: xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
===
--- xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
2013-05-05 17:47:29 UTC (rev 184290)
+++ xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
2013-05-05 17:49:01 UTC (rev 184291)
@@ -1,55 +0,0 @@
-From 2ec636049b95d0c51286253813b5b1a074472afc Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc lio...@lefolgoc.net
-Date: Sun, 09 Sep 2012 09:50:19 +
-Subject: Xfsettingsd: Check service name of NameOwnerChanged (bug #9273).
-
-In some conditions, the dbus spawn of xfconf leads to the
-shutdown of xfsettingsd because it thinks another instance
-is taking over... After some debugging I found that it
-receives a NameOwnerChanged signal describing the launch
-of Xfconf (name=org.xfce.Xfconf, old=, new=:1.11 for example).
-
-(cherry picked from commit c17fe35e6f2ff673bab102e736a327fa7bcc1d73)
-diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
-index 0f3a68d..55c4183 100644
a/xfsettingsd/main.c
-+++ b/xfsettingsd/main.c
-@@ -93,15 +93,29 @@ signal_handler (gint signum,
-
-
- static DBusHandlerResult
--dbus_connection_filter_func (DBusConnection *connection,
-- DBusMessage*message,
-- void *user_data)
-+dbus_connection_filter_func (DBusConnection *connection,
-+ DBusMessage*message,
-+ void *user_data)
- {
-+gchar *name, *old, *new;
-+
- if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
NameOwnerChanged))
- {
--g_printerr (G_LOG_DOMAIN : %s\n, Another instance took over.
Leaving...);
--gtk_main_quit ();
--return DBUS_HANDLER_RESULT_HANDLED;
-+/* double check if it is really org.xfce.SettingsDaemon
-+ * being replaced, see bug 9273 */
-+if (dbus_message_get_args (message, NULL,
-+ DBUS_TYPE_STRING, name,
-+ DBUS_TYPE_STRING, old,
-+ DBUS_TYPE_STRING, new,
-+ DBUS_TYPE_INVALID))
-+{
-+if (g_strcmp0 (name, XFSETTINGS_DBUS_NAME) == 0)
-+{
-+g_printerr (G_LOG_DOMAIN : %s\n, Another instance took
over. Leaving...);
-+gtk_main_quit ();
-+
[arch-commits] Commit in xfce4-settings/trunk (3 files)
Date: Sunday, October 21, 2012 @ 00:01:11
Author: foutrelis
Revision: 169427
upgpkg: xfce4-settings 4.10.0-3
Add patches for upstream bugs 9272 and 9273. (FS#31806)
Added:
xfce4-settings/trunk/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
xfce4-settings/trunk/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
Modified:
xfce4-settings/trunk/PKGBUILD
+
PKGBUILD | 12 ++
xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch | 55
++
xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch | 22
3 files changed, 88 insertions(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-10-21 00:46:02 UTC (rev 169426)
+++ PKGBUILD2012-10-21 04:01:11 UTC (rev 169427)
@@ -5,7 +5,7 @@
pkgname=xfce4-settings
pkgver=4.10.0
-pkgrel=2
+pkgrel=3
pkgdesc=Settings manager for xfce
arch=('i686' 'x86_64')
url=http://www.xfce.org/;
@@ -16,8 +16,12 @@
makedepends=('intltool')
optdepends=('libcanberra: for sound control')
source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
+xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
xfce4-settings-xml-4.10.0.patch)
sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e'
+'28482a3410d587fe051b84080ab5366b4fbe2af8684ee46384ff899b73d3f349'
+'5be974f8fba6ba9dc14e136762cf752fe46eac99f71511d77d910610b5401244'
'78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196')
build() {
@@ -27,6 +31,12 @@
# (taken from Fedora)
patch -Np1 -i $srcdir/xfce4-settings-xml-4.10.0.patch
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9272
+ patch -Np1 -i $srcdir/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=9273
+ patch -Np1 -i
$srcdir/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
+
./configure \
--prefix=/usr \
--sysconfdir=/etc \
Added: xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
===
--- xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
(rev 0)
+++ xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch
2012-10-21 04:01:11 UTC (rev 169427)
@@ -0,0 +1,55 @@
+From 2ec636049b95d0c51286253813b5b1a074472afc Mon Sep 17 00:00:00 2001
+From: Lionel Le Folgoc lio...@lefolgoc.net
+Date: Sun, 09 Sep 2012 09:50:19 +
+Subject: Xfsettingsd: Check service name of NameOwnerChanged (bug #9273).
+
+In some conditions, the dbus spawn of xfconf leads to the
+shutdown of xfsettingsd because it thinks another instance
+is taking over... After some debugging I found that it
+receives a NameOwnerChanged signal describing the launch
+of Xfconf (name=org.xfce.Xfconf, old=, new=:1.11 for example).
+
+(cherry picked from commit c17fe35e6f2ff673bab102e736a327fa7bcc1d73)
+---
+diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
+index 0f3a68d..55c4183 100644
+--- a/xfsettingsd/main.c
b/xfsettingsd/main.c
+@@ -93,15 +93,29 @@ signal_handler (gint signum,
+
+
+ static DBusHandlerResult
+-dbus_connection_filter_func (DBusConnection *connection,
+- DBusMessage*message,
+- void *user_data)
++dbus_connection_filter_func (DBusConnection *connection,
++ DBusMessage*message,
++ void *user_data)
+ {
++gchar *name, *old, *new;
++
+ if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS,
NameOwnerChanged))
+ {
+-g_printerr (G_LOG_DOMAIN : %s\n, Another instance took over.
Leaving...);
+-gtk_main_quit ();
+-return DBUS_HANDLER_RESULT_HANDLED;
++/* double check if it is really org.xfce.SettingsDaemon
++ * being replaced, see bug 9273 */
++if (dbus_message_get_args (message, NULL,
++ DBUS_TYPE_STRING, name,
++ DBUS_TYPE_STRING, old,
++ DBUS_TYPE_STRING, new,
++ DBUS_TYPE_INVALID))
++{
++if (g_strcmp0 (name, XFSETTINGS_DBUS_NAME) == 0)
++{
++g_printerr (G_LOG_DOMAIN : %s\n, Another instance took
over. Leaving...);
++gtk_main_quit ();
++return DBUS_HANDLER_RESULT_HANDLED;
++}
++}
+ }
+
+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+--
+cgit v0.9.0.3
Added: xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch
[arch-commits] Commit in xfce4-settings/trunk (3 files)
Date: Saturday, April 28, 2012 @ 19:11:19
Author: foutrelis
Revision: 157541
upgpkg: xfce4-settings 4.10.0-1
New upstream release.
Added:
xfce4-settings/trunk/xfce4-settings-xml-4.10.0.patch
Modified:
xfce4-settings/trunk/PKGBUILD
Deleted:
xfce4-settings/trunk/xfce4-settings-4.6.0.patch
-+
PKGBUILD| 18 +-
xfce4-settings-4.6.0.patch | 18 --
xfce4-settings-xml-4.10.0.patch | 26 ++
3 files changed, 35 insertions(+), 27 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-28 22:55:48 UTC (rev 157540)
+++ PKGBUILD2012-04-28 23:11:19 UTC (rev 157541)
@@ -4,28 +4,28 @@
# Contributor: Corrado Primier ba...@aur.archlinux.org
pkgname=xfce4-settings
-pkgver=4.8.3
-pkgrel=2
+pkgver=4.10.0
+pkgrel=1
pkgdesc=Settings manager for xfce
arch=('i686' 'x86_64')
url=http://www.xfce.org/;
license=('GPL2')
groups=('xfce4')
-depends=('exo' 'libxfce4ui' 'libnotify' 'libxklavier' 'gnome-icon-theme'
- 'gtk-engines' 'gtk-xfce-engine')
+depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier'
+ 'gnome-icon-theme' 'gtk-engines' 'gtk2-xfce-engine')
makedepends=('intltool')
optdepends=('libcanberra: for sound control')
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2
-xfce4-settings-4.6.0.patch)
-sha256sums=('d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e'
-'c91d246cc678014a7fa8af37f2a24640bcc8823e41e064361130da7ae3809ed5')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
+xfce4-settings-xml-4.10.0.patch)
+sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e'
+'544d4409bac1cba1c0897317838cf2e24345f6ed4e3bf497a89b38d2643925c1')
build() {
cd $srcdir/$pkgname-$pkgver
# enable gnome icon theme, clearlooks theme and font hinting by default
# (taken from Fedora)
- patch -Np1 -i $srcdir/xfce4-settings-4.6.0.patch
+ patch -Np1 -i $srcdir/xfce4-settings-xml-4.10.0.patch
./configure --prefix=/usr \
--sysconfdir=/etc \
Deleted: xfce4-settings-4.6.0.patch
===
--- xfce4-settings-4.6.0.patch 2012-04-28 22:55:48 UTC (rev 157540)
+++ xfce4-settings-4.6.0.patch 2012-04-28 23:11:19 UTC (rev 157541)
@@ -1,18 +0,0 @@
-diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml
xfce4-settings-4.6.0/xfsettingsd/xsettings.xml
xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml2009-02-20
10:12:35.0 -0700
-+++ xfce4-settings-4.6.0/xfsettingsd/xsettings.xml 2009-04-16
15:25:44.0 -0600
-@@ -2,10 +2,12 @@
-
- channel name=xsettings version=1.0
- property name=Net type=empty
--property name=ThemeName type=string value=Xfce/
--property name=IconThemeName type=string value=Rodent/
-+property name=ThemeName type=string value=Clearlooks/
-+property name=IconThemeName type=string value=gnome/
- /property
- property name=Xft type=empty
- property name=DPI type=int value=-1/
-+property name=Antialias type=int value=1/
-+property name=HintStyle type=string value=hintfull/
- /property
- /channel
Added: xfce4-settings-xml-4.10.0.patch
===
--- xfce4-settings-xml-4.10.0.patch (rev 0)
+++ xfce4-settings-xml-4.10.0.patch 2012-04-28 23:11:19 UTC (rev 157541)
@@ -0,0 +1,26 @@
+diff -Nur xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml
xfce4-settings-4.9.4/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.9.4.orig/xfsettingsd/xsettings.xml2012-04-01
03:58:17.0 -0600
xfce4-settings-4.9.4/xfsettingsd/xsettings.xml 2012-04-02
14:59:57.72009 -0600
+@@ -6,8 +6,8 @@
+ ?xml version=1.0 encoding=UTF-8?
+ channel name=xsettings version=1.0
+ property name=Net type=empty
+-property name=ThemeName type=empty/
+-property name=IconThemeName type=empty/
++property name=ThemeName type=Clearlooks/
++property name=IconThemeName type=gnome/
+ property name=DoubleClickTime type=int value=250/
+ property name=DoubleClickDistance type=int value=5/
+ property name=DndDragThreshold type=int value=8/
+@@ -19,9 +19,9 @@
+ /property
+ property name=Xft type=empty
+ property name=DPI type=empty/
+-property name=Antialias type=int value=-1/
++property name=Antialias type=int value=1/
+ property name=Hinting type=int value=-1/
+-property name=HintStyle type=string value=hintnone/
++property name=HintStyle type=string value=hintfull/
+ property name=RGBA type=string value=none/
+ !-- property name=Lcdfilter type=string value=none/ --
+ /property
[arch-commits] Commit in xfce4-settings/trunk (3 files)
Date: Saturday, May 22, 2010 @ 11:13:10
Author: andyrtr
Revision: 80854
upgpkg: xfce4-settings 4.6.5-1
new version 4.6.5; depend on tango-icon-theme #16444/16428; use default
clearlooks engine for modern style ^Cd depend on some more engines for more
choice
Added:
xfce4-settings/trunk/xfce4-settings-4.6.0.patch
Modified:
xfce4-settings/trunk/PKGBUILD
Deleted:
xfce4-settings/trunk/xklavier-5.patch
+
PKGBUILD | 21 -
xfce4-settings-4.6.0.patch | 18 ++
xklavier-5.patch | 37 -
3 files changed, 30 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-05-22 15:00:29 UTC (rev 80853)
+++ PKGBUILD2010-05-22 15:13:10 UTC (rev 80854)
@@ -3,30 +3,33 @@
# Contributor: Corrado Primier ba...@aur.archlinux.org
pkgname=xfce4-settings
-pkgver=4.6.4
-pkgrel=2
+pkgver=4.6.5
+pkgrel=1
pkgdesc=Settings manager for xfce
arch=('i686' 'x86_64')
license=('GPL2')
url=http://www.xfce.org/;
groups=('xfce4')
-depends=('exo=0.3.106' 'libnotify=0.4.5' 'libxfcegui4=4.6.1'
'libxklavier=5.0' 'libwnck=2.30.0')
+depends=('exo=0.3.107' 'libnotify=0.4.5' 'libxfcegui4=4.6.4'
'libxklavier=5.0' 'libwnck=2.30.0' 'tango-icon-theme' 'gtk-engines'
'gtk-xfce-engine')
makedepends=('intltool')
optdepends=('libcanberra: for sound control')
conflicts=('xfce-mcs-manager')
replaces=('xfce-mcs-manager')
source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2
-xklavier-5.patch)
-md5sums=('04985407e8e5b916c44780314a177e96'
- '41306a7a8f7117f5a1ec8bf8207878e5')
+ xfce4-settings-4.6.0.patch)
+md5sums=('f988cb732913b5fbc115ad7105d2231e'
+ '3046732e5d73c9939e7674602eadb1e2')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/xklavier-5.patch || return 1
- autoheader || return 1
- autoconf || return 1
+ # enable Tango icon theme, clearlooks theme and font hinting by
default(taken from Fedora)
+ patch -Np1 -i ${srcdir}/xfce4-settings-4.6.0.patch || return 1
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --enable-libxklavier --enable-sound-settings || return 1
make || return 1
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install || return 1
}
Added: xfce4-settings-4.6.0.patch
===
--- xfce4-settings-4.6.0.patch (rev 0)
+++ xfce4-settings-4.6.0.patch 2010-05-22 15:13:10 UTC (rev 80854)
@@ -0,0 +1,18 @@
+diff -Nur xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml
xfce4-settings-4.6.0/xfsettingsd/xsettings.xml
+--- xfce4-settings-4.6.0.orig/xfsettingsd/xsettings.xml2009-02-20
10:12:35.0 -0700
xfce4-settings-4.6.0/xfsettingsd/xsettings.xml 2009-04-16
15:25:44.0 -0600
+@@ -2,10 +2,12 @@
+
+ channel name=xsettings version=1.0
+ property name=Net type=empty
+-property name=ThemeName type=string value=Xfce/
+-property name=IconThemeName type=string value=Rodent/
++property name=ThemeName type=string value=Clearlooks/
++property name=IconThemeName type=string value=Tango/
+ /property
+ property name=Xft type=empty
+ property name=DPI type=int value=-1/
++property name=Antialias type=int value=1/
++property name=HintStyle type=string value=hintfull/
+ /property
+ /channel
Deleted: xklavier-5.patch
===
--- xklavier-5.patch2010-05-22 15:00:29 UTC (rev 80853)
+++ xklavier-5.patch2010-05-22 15:13:10 UTC (rev 80854)
@@ -1,37 +0,0 @@
-From bdeff0efd3342b36e56830fd208103c4453ad0d4 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc mrpo...@ubuntu.com
-Date: Mon, 25 Jan 2010 21:36:32 +
-Subject: Port to libxklavier 5.0 API.
-
-diff --git a/configure.ac.in b/configure.ac.in
-index 59e93b2..acd432e 100644
a/configure.ac
-+++ b/configure.ac
-@@ -137,6 +137,8 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER], [libxklavier],
[0.3.0],
-[libxklavier], [Keyboard layout selection])
- XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER4], [libxklavier], [4.0],
-[libxklavier], [Keyboard layout selection])
-+XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0],
-+ [libxklavier], [Keyboard layout selection])
-
- dnl
- dnl *** Xsettings daemon is optional ***
-diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c
b/dialogs/keyboard-settings/xfce-keyboard-settings.c
-index 631dc69..5ff7ae3 100644
a/dialogs/keyboard-settings/xfce-keyboard-settings.c
-+++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c
-@@ -395,7 +395,11 @@ xfce_keyboard_settings_finalize (GObject *object)
-
- #ifdef
