diff options
| -rw-r--r-- | .SRCINFO | 25 | ||||
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | 0002-Fix-GTK-3.14-incompatibilities.patch | 56 | ||||
| -rw-r--r-- | PKGBUILD | 47 | ||||
| -rw-r--r-- | gnome-session.install | 12 |
5 files changed, 99 insertions, 49 deletions
@@ -1,26 +1,21 @@ pkgbase = gnome-session-properties pkgdesc = The GNOME Session Properties Tool - pkgver = 3.10.0 - pkgrel = 2 - url = http://www.gnome.org - install = gnome-session.install - arch = i686 + pkgver = 3.10.1 + pkgrel = 1 + url = https://www.gnome.org arch = x86_64 - license = GPL - license = LGPL + license = GPL-2.0-or-later makedepends = gnome-common makedepends = gtk-doc makedepends = intltool depends = gtk3 depends = hicolor-icon-theme depends = dbus-glib - options = !emptydirs - source = http://ftp.gnome.org/pub/gnome/sources/gnome-session/3.10/gnome-session-3.10.0.tar.xz - source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/b8632ea084b21e5fdef70a5ba7787c5567403146/gnome-session-properties/0001-Remove-unneeded-stuff.patch - source = https://raw.githubusercontent.com/chenxiaolong/AUR-Files/b8632ea084b21e5fdef70a5ba7787c5567403146/gnome-session-properties/0002-Fix-GTK-3.14-incompatibilities.patch - sha512sums = 036adc7ecff7f5aa1319bfac636b6b77925c689cb92880224cf665456dca5a55299025971a2bcdb841e27334ddc0cd6125241b39e48a30c3cc0b02c22612f5c9 - sha512sums = 4446d916a9fde873ab6aa6186ee9c135e250705c95fb365d6c83d9b2f4fd28f507baabc159f8d53da8f463240c95eb40d9e8aa3115a74b6d2ad624ed8bd948c1 - sha512sums = d1983d3747f42eebe69e5459ba7e8e71fc028f94cd4c7429171c78f449235f060757dbbb84296c323047195d9271cf97e6599dca5ee5864999bcce03e7fc8093 + source = https://download-fallback.gnome.org/sources/gnome-session/3.10/gnome-session-3.10.1.tar.xz + source = https://raw.githubusercontent.com/yochananmarqos/pkgbuilds/master/gnome-session-properties/0001-Remove-unneeded-stuff.patch + source = 0002-Fix-GTK-3.14-incompatibilities.patch + sha256sums = f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc + sha256sums = 4a064778dbbd235322bbbefd086ea7653679a0714230ebcac772eab373d83991 + sha256sums = a06118f85b26ef13d82f666f8a86cae1fb3e9ca12cd45703ef4dd9ecadfa3aab pkgname = gnome-session-properties - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..e2aed964e769 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +# Ignore everything +* + +# But not these files... +!.gitignore +!PKGBUILD +!.SRCINFO +!0002-Fix-GTK-3.14-incompatibilities.patch diff --git a/0002-Fix-GTK-3.14-incompatibilities.patch b/0002-Fix-GTK-3.14-incompatibilities.patch new file mode 100644 index 000000000000..790b68dbc97b --- /dev/null +++ b/0002-Fix-GTK-3.14-incompatibilities.patch @@ -0,0 +1,56 @@ +From fde630356c1ec89d996f8a68d770dd499cab7e90 Mon Sep 17 00:00:00 2001 +From: Xiao-Long Chen <chenxiaolong@cxl.epac.to> +Date: Sat, 1 Nov 2014 13:52:02 -0400 +Subject: [PATCH 2/2] Fix GTK 3.14 incompatibilities + +--- + capplet/gsm-app-dialog.c | 6 ++++++ + capplet/gsm-properties-dialog.c | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/capplet/gsm-app-dialog.c b/capplet/gsm-app-dialog.c +index e7369dd..b072d10 100644 +--- a/capplet/gsm-app-dialog.c ++++ b/capplet/gsm-app-dialog.c +@@ -179,10 +179,14 @@ setup_dialog (GsmAppDialog *dialog) + gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); + gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties"); + ++#if !GTK_CHECK_VERSION (3, 14, 0) + g_object_set (dialog, + "allow-shrink", FALSE, + "allow-grow", FALSE, + NULL); ++#else ++ gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); ++#endif + + gtk_dialog_add_button (GTK_DIALOG (dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); +@@ -250,7 +254,9 @@ gsm_app_dialog_constructor (GType type, + + setup_dialog (dialog); + ++#if !GTK_CHECK_VERSION (3, 14, 0) + gtk_widget_show_all (GTK_WIDGET (dialog)); ++#endif + + return G_OBJECT (dialog); + } +diff --git a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c +index 24bf907..81f26da 100644 +--- a/capplet/gsm-properties-dialog.c ++++ b/capplet/gsm-properties-dialog.c +@@ -659,7 +659,9 @@ gsm_properties_dialog_constructor (GType type, + + setup_dialog (dialog); + ++#if !GTK_CHECK_VERSION (3, 14, 0) + gtk_widget_show (GTK_WIDGET (dialog)); ++#endif + + return G_OBJECT (dialog); + } +-- +2.1.3 + @@ -1,27 +1,33 @@ -# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to> - +# Maintainer: Mark Wagie <mark dot wagie at proton dot me> +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> pkgname=gnome-session-properties -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="The GNOME Session Properties Tool" -arch=(i686 x86_64) -license=(GPL LGPL) -depends=(gtk3 hicolor-icon-theme dbus-glib) -makedepends=(gnome-common gtk-doc intltool) -options=('!emptydirs') -install=gnome-session.install -url="http://www.gnome.org" -source=("http://ftp.gnome.org/pub/gnome/sources/gnome-session/${pkgver%.*}/gnome-session-${pkgver}.tar.xz" - https://raw.githubusercontent.com/chenxiaolong/AUR-Files/b8632ea084b21e5fdef70a5ba7787c5567403146/gnome-session-properties/0001-Remove-unneeded-stuff.patch - https://raw.githubusercontent.com/chenxiaolong/AUR-Files/b8632ea084b21e5fdef70a5ba7787c5567403146/gnome-session-properties/0002-Fix-GTK-3.14-incompatibilities.patch) -sha512sums=('036adc7ecff7f5aa1319bfac636b6b77925c689cb92880224cf665456dca5a55299025971a2bcdb841e27334ddc0cd6125241b39e48a30c3cc0b02c22612f5c9' - '4446d916a9fde873ab6aa6186ee9c135e250705c95fb365d6c83d9b2f4fd28f507baabc159f8d53da8f463240c95eb40d9e8aa3115a74b6d2ad624ed8bd948c1' - 'd1983d3747f42eebe69e5459ba7e8e71fc028f94cd4c7429171c78f449235f060757dbbb84296c323047195d9271cf97e6599dca5ee5864999bcce03e7fc8093') +arch=('x86_64') +url="https://www.gnome.org" +license=('GPL-2.0-or-later') +depends=('gtk3' 'hicolor-icon-theme' 'dbus-glib') +makedepends=('gnome-common' 'gtk-doc' 'intltool') +source=("https://download-fallback.gnome.org/sources/gnome-session/${pkgver%.*}/gnome-session-${pkgver}.tar.xz" + # Patch too large to upload to aurweb + 'https://raw.githubusercontent.com/yochananmarqos/pkgbuilds/master/gnome-session-properties/0001-Remove-unneeded-stuff.patch' + '0002-Fix-GTK-3.14-incompatibilities.patch') +sha256sums=('f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc' + '4a064778dbbd235322bbbefd086ea7653679a0714230ebcac772eab373d83991' + 'a06118f85b26ef13d82f666f8a86cae1fb3e9ca12cd45703ef4dd9ecadfa3aab') prepare() { cd "gnome-session-${pkgver}" - patch -p1 -i ../0001-Remove-unneeded-stuff.patch - patch -p1 -i ../0002-Fix-GTK-3.14-incompatibilities.patch + patch -Np1 -i ../0001-Remove-unneeded-stuff.patch + patch -Np1 -i ../0002-Fix-GTK-3.14-incompatibilities.patch + + # Fix icon + sed -ri '/^Icon/ s/session-/gnome-session-/g' \ + "data/$pkgname.desktop.in.in" + + # Don't hide from application menu + sed -i '/NoDisplay=true/d' "data/$pkgname.desktop.in.in" } build() { @@ -39,7 +45,4 @@ package() { for f in ${files}; do mv "${f}" "${f/apps\/session-/apps\/gnome-session-}" done - - sed -ri '/^Icon/ s/session-/gnome-session-/g' \ - "${pkgdir}/usr/share/applications/gnome-session-properties.desktop" } diff --git a/gnome-session.install b/gnome-session.install deleted file mode 100644 index 1e39b2a8ab1c..000000000000 --- a/gnome-session.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas/ - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor/ -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} |