[arch-commits] Commit in sugar/trunk (PKGBUILD remove-gconf.patch)
Date: Thursday, March 28, 2019 @ 22:56:52
Author: bgyorgy
Revision: 445650
upgpkg: sugar 0.113-1
Update to new version
Modified:
sugar/trunk/PKGBUILD
Deleted:
sugar/trunk/remove-gconf.patch
+
PKGBUILD | 18
remove-gconf.patch | 1019 ---
2 files changed, 5 insertions(+), 1032 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-28 22:51:37 UTC (rev 445649)
+++ PKGBUILD2019-03-28 22:56:52 UTC (rev 445650)
@@ -1,8 +1,8 @@
# Maintainer: Balló György
pkgname=sugar
-pkgver=0.112
-pkgrel=3
+pkgver=0.113
+pkgrel=1
pkgdesc="Sugar GTK shell"
arch=('any')
url="https://sugarlabs.org/";
@@ -13,16 +13,12 @@
'xdg-user-dirs')
makedepends=('intltool')
source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
-dont-overwrite-settings.patch
-remove-gconf.patch)
-sha256sums=('39aa7ffe866c9f1b4a113e7a400686d60277a3517db1fed62f536b1fdc71c38b'
-'3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c'
-'138e652824feae8c0e324e19cc11d3793035c81db868a7bb21d2e05531ea98fc')
+dont-overwrite-settings.patch)
+sha256sums=('dd0f8d632db5f1123cca34106ebdd3a984145c33c0e3f530853e0819947bd2a0'
+'3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c')
prepare() {
cd $pkgname-$pkgver
- sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/jarabe/model/update/aslo.py
- sed -i "s/gi.require_version('WebKit', '3.0')/gi.require_version('WebKit2',
'4.0')/" src/jarabe/main.py
# Use correct D-Bus config location
sed -i '/^nmservicedir =/ s/sysconfdir/datadir/' data/Makefile.{am,in}
@@ -29,10 +25,6 @@
# Don't overwrite default GNOME settings
patch -Np1 -i ../dont-overwrite-settings.patch
-
- # Remove GConf support
- patch -Np1 -i ../remove-gconf.patch
- autoreconf -fi
}
build() {
Deleted: remove-gconf.patch
===
--- remove-gconf.patch 2019-03-28 22:51:37 UTC (rev 445649)
+++ remove-gconf.patch 2019-03-28 22:56:52 UTC (rev 445650)
@@ -1,1019 +0,0 @@
-From 38b173dd908209852d10501bbd64ce930286fdb7 Mon Sep 17 00:00:00 2001
-From: James Cameron
-Date: Mon, 26 Mar 2018 14:52:44 +1100
-Subject: [PATCH] jarabe, extensions - remove GConf compatibility
-
-GConf compatibility support in Sugar allowed activities to read or be
-notified of changes to age, gender, nick, user colour, collaboration
-server, backup server, or automatic power management. Redundant code
-updated GConf values at the same time as updates to Gio.Settings values.
-
-Remove GConf from Sugar;
-
-- remove the autoconf rules,
-
-- remove the Makefile rules,
-
-- remove the schema conversion for upgrades from GTK+ 2 Sugar,
-
-- remove the gsettings-migrated setting key,
-
-- remove the GConf schema from POTFILES.in,
-
-- remove the GConf schema,
-
-- remove redundant code for GConf value updates,
-
-- remove migration from GConf to Gio.Settings.
-
-Warning: may break some activities. May cause default values to be
-used, traceback, or fail to start for any activity using the removed
-GConf schema to read the removed configuration values for; age, gender,
-nick, user colour, collaboration server, backup server, and automatic
-power management. Fix GTK+ 2 activities by porting to GTK+ 3 and
-Gio.Settings. Fix GTK+ 3 activities by porting from GConf to
-Gio.Settings.
-
-Tested on Ubuntu 16.04.
-
-Tested on Ubuntu 18.04 with autogen.sh, distcheck, install, uninstall.
- configure.ac | 11 +-
- data/Makefile.am | 16 +-
- data/org.sugarlabs.gschema.xml| 5 -
- data/sugar-schemas.convert| 69 -
- data/sugar.schemas.in | 491 --
- extensions/cpsection/aboutme/model.py | 15 --
- extensions/cpsection/network/model.py | 11 -
- extensions/cpsection/power/model.py | 5 -
- po/POTFILES.in| 1 -
- src/jarabe/desktop/schoolserver.py| 7 -
- src/jarabe/intro/__init__.py | 6 +-
- src/jarabe/intro/agepicker.py | 5 -
- src/jarabe/intro/genderpicker.py | 6 -
- src/jarabe/intro/window.py| 10 -
- src/jarabe/main.py| 106
- 15 files changed, 4 insertions(+), 760 deletions(-)
- delete mode 100644 data/sugar-schemas.convert
- delete mode 100644 data/sugar.schemas.in
-
-diff --git a/configure.ac b/configure.ac
-index 4e8ae65fa..be64e6731 100644
a/configure.ac
-+++ b/configure.ac
-@@ -15,7 +15,7 @@ AM_MAINTAINER_MODE
- PYTHON=python2
- AM_PATH_PYTHON
-
--PKG_CHECK_MODULES(SHELL, gtk+-3.0 gconf-2.0)
-+PKG_CHECK_MODULES(SHELL, gtk+-3.0)
-
- IT_PROG_INTLTOOL([0.35.0])
- GETTEXT_PACKAGE=sugar
-@@ -28,15 +28,6 @@ AC_ARG_ENABLE(update-mimedb,
- enable_update_mimedb=yes)
- AM_CONDITIONAL(ENABLE_UP
[arch-commits] Commit in sugar/trunk (PKGBUILD remove-gconf.patch)
Date: Tuesday, April 10, 2018 @ 12:38:36
Author: bgyorgy
Revision: 315586
upgpkg: sugar 0.112-2
Remove GConf support
Added:
sugar/trunk/remove-gconf.patch
Modified:
sugar/trunk/PKGBUILD
+
PKGBUILD | 17
remove-gconf.patch | 1019 +++
2 files changed, 1030 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-10 12:10:24 UTC (rev 315585)
+++ PKGBUILD2018-04-10 12:38:36 UTC (rev 315586)
@@ -3,20 +3,22 @@
pkgname=sugar
pkgver=0.112
-pkgrel=1
+pkgrel=2
pkgdesc="Sugar GTK shell"
arch=('any')
url="https://sugarlabs.org/";
license=('GPL')
-depends=('gconf' 'gnome-keyring' 'gst-plugins-espeak' 'gtksourceview3' 'gvfs'
'libwnck3'
+depends=('gnome-keyring' 'gst-plugins-espeak' 'gtksourceview3' 'gvfs'
'libwnck3'
'libxklavier' 'metacity' 'mobile-broadband-provider-info' 'openssh'
'python2-gwebsockets'
'sugar-toolkit-gtk3' 'telepathy-gabble' 'telepathy-salut' 'upower'
'webkit2gtk'
'xdg-user-dirs')
makedepends=('intltool')
source=(https://download.sugarlabs.org/sources/sucrose/glucose/$pkgname/$pkgname-$pkgver.tar.xz
-dont-overwrite-settings.patch)
+dont-overwrite-settings.patch
+remove-gconf.patch)
sha256sums=('39aa7ffe866c9f1b4a113e7a400686d60277a3517db1fed62f536b1fdc71c38b'
-'3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c')
+'3ce2db5d003b3172302492a2c8ae1ba34aeafdfc6038c6751eb41c56909a062c'
+'138e652824feae8c0e324e19cc11d3793035c81db868a7bb21d2e05531ea98fc')
prepare() {
cd $pkgname-$pkgver
@@ -25,13 +27,16 @@
# Don't overwrite default GNOME settings
patch -Np1 -i ../dont-overwrite-settings.patch
+
+ # Remove GConf support
+ patch -Np1 -i ../remove-gconf.patch
+ autoreconf -fi
}
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
- --disable-schemas-install --disable-schemas-compile \
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+ --disable-schemas-compile
make
}
Added: remove-gconf.patch
===
--- remove-gconf.patch (rev 0)
+++ remove-gconf.patch 2018-04-10 12:38:36 UTC (rev 315586)
@@ -0,0 +1,1019 @@
+From 38b173dd908209852d10501bbd64ce930286fdb7 Mon Sep 17 00:00:00 2001
+From: James Cameron
+Date: Mon, 26 Mar 2018 14:52:44 +1100
+Subject: [PATCH] jarabe, extensions - remove GConf compatibility
+
+GConf compatibility support in Sugar allowed activities to read or be
+notified of changes to age, gender, nick, user colour, collaboration
+server, backup server, or automatic power management. Redundant code
+updated GConf values at the same time as updates to Gio.Settings values.
+
+Remove GConf from Sugar;
+
+- remove the autoconf rules,
+
+- remove the Makefile rules,
+
+- remove the schema conversion for upgrades from GTK+ 2 Sugar,
+
+- remove the gsettings-migrated setting key,
+
+- remove the GConf schema from POTFILES.in,
+
+- remove the GConf schema,
+
+- remove redundant code for GConf value updates,
+
+- remove migration from GConf to Gio.Settings.
+
+Warning: may break some activities. May cause default values to be
+used, traceback, or fail to start for any activity using the removed
+GConf schema to read the removed configuration values for; age, gender,
+nick, user colour, collaboration server, backup server, and automatic
+power management. Fix GTK+ 2 activities by porting to GTK+ 3 and
+Gio.Settings. Fix GTK+ 3 activities by porting from GConf to
+Gio.Settings.
+
+Tested on Ubuntu 16.04.
+
+Tested on Ubuntu 18.04 with autogen.sh, distcheck, install, uninstall.
+---
+ configure.ac | 11 +-
+ data/Makefile.am | 16 +-
+ data/org.sugarlabs.gschema.xml| 5 -
+ data/sugar-schemas.convert| 69 -
+ data/sugar.schemas.in | 491 --
+ extensions/cpsection/aboutme/model.py | 15 --
+ extensions/cpsection/network/model.py | 11 -
+ extensions/cpsection/power/model.py | 5 -
+ po/POTFILES.in| 1 -
+ src/jarabe/desktop/schoolserver.py| 7 -
+ src/jarabe/intro/__init__.py | 6 +-
+ src/jarabe/intro/agepicker.py | 5 -
+ src/jarabe/intro/genderpicker.py | 6 -
+ src/jarabe/intro/window.py| 10 -
+ src/jarabe/main.py| 106
+ 15 files changed, 4 insertions(+), 760 deletions(-)
+ delete mode 100644 data/sugar-schemas.convert
+ delete mode 100644 data/sugar.schemas.in
+
+diff --git a/configure.ac b/configure.ac
+index 4e8ae65fa..be64e6731 100644
+--- a/configure.ac
b/configure.ac
+@@ -15,7 +15,7 @@ AM_MAINTAINER_MODE
+ PYTHON=python2
+ AM_PATH_PYTHON
+
+-PKG_CHECK_MODULES(SHELL, gtk+-3.0 gconf-2.0)
++PKG_
