[arch-commits] Commit in gnome-panel/trunk (2 files)

Balló György bgyorgy at archlinux.org
Mon Apr 25 20:59:47 UTC 2016


    Date: Monday, April 25, 2016 @ 22:59:47
  Author: bgyorgy
Revision: 171854

upgpkg: gnome-panel 3.20.0-1

Update to new version

Modified:
  gnome-panel/trunk/PKGBUILD
Deleted:
  gnome-panel/trunk/0001-Theme-set-font-settings-directly-on-label.patch

------------------------------------------------------+
 0001-Theme-set-font-settings-directly-on-label.patch |  185 -----------------
 PKGBUILD                                             |   30 --
 2 files changed, 7 insertions(+), 208 deletions(-)

Deleted: 0001-Theme-set-font-settings-directly-on-label.patch
===================================================================
--- 0001-Theme-set-font-settings-directly-on-label.patch	2016-04-25 20:45:26 UTC (rev 171853)
+++ 0001-Theme-set-font-settings-directly-on-label.patch	2016-04-25 20:59:47 UTC (rev 171854)
@@ -1,185 +0,0 @@
-From b9db0c1ac7410adc6e9c751d842d326712861a0a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sun, 10 Apr 2016 23:31:59 +0200
-Subject: [PATCH] Theme: set font settings directly on label
-
-Otherwise it's ignored.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764867
----
- applets/clock/calendar-window.c         |  2 ++
- data/theme/Adwaita/gnome-panel-dark.css | 18 ++++++++++--------
- data/theme/Adwaita/gnome-panel.css      | 23 +++++++++++++++--------
- data/theme/HighContrast/gnome-panel.css | 31 +++++++++++++++++++++++--------
- 4 files changed, 50 insertions(+), 24 deletions(-)
-
-diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
-index 89534b6..c562c82 100644
---- a/applets/clock/calendar-window.c
-+++ b/applets/clock/calendar-window.c
-@@ -1784,6 +1784,8 @@ calendar_window_class_init (CalendarWindowClass *klass)
- 				      "Whether the window should offer access to preferences",
- 				      FALSE,
- 				      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-+
-+	gtk_widget_class_set_css_name (gobject_class, "gp-calendar-window");
- }
- 
- static void
-diff --git a/data/theme/Adwaita/gnome-panel-dark.css b/data/theme/Adwaita/gnome-panel-dark.css
-index cb7c14c..23b6674 100644
---- a/data/theme/Adwaita/gnome-panel-dark.css
-+++ b/data/theme/Adwaita/gnome-panel-dark.css
-@@ -6,20 +6,23 @@ panel-plug {
- .gnome-panel-menu-bar,
- panel-applet > menubar,
- clock-box {
--  font: regular;
-   background: transparent;
--  color: #ffffff;
-   box-shadow: none;
- }
- 
--.gnome-panel-menu-bar menu,
--panel-applet > menubar menu {
--  font: regular;
--}
--
- .gnome-panel-menu-bar menuitem:hover,
- panel-applet > menubar menuitem:hover {
-   background-color: #215d9c;
-+}
-+
-+.gnome-panel-menu-bar > menuitem > label,
-+panel-applet > menubar > menuitem > label,
-+clock-box label,
-+gp-calendar-window label,
-+#tasklist-button label,
-+#clock-applet-button label,
-+#showdesktop-button label {
-+  font: regular;
-   color: #ffffff;
- }
- 
-@@ -27,7 +30,6 @@ panel-applet > menubar menuitem:hover {
- #clock-applet-button,
- #showdesktop-button {
-   padding: 0px 4px;
--  color: #ffffff;
-   border: 0;
-   border-radius: 0;
- }
-diff --git a/data/theme/Adwaita/gnome-panel.css b/data/theme/Adwaita/gnome-panel.css
-index d403497..54f5d76 100644
---- a/data/theme/Adwaita/gnome-panel.css
-+++ b/data/theme/Adwaita/gnome-panel.css
-@@ -6,20 +6,28 @@ panel-plug {
- .gnome-panel-menu-bar,
- panel-applet > menubar,
- clock-box {
--  font: regular;
-   background: transparent;
--  color: #000000;
-   box-shadow: none;
- }
- 
--.gnome-panel-menu-bar menu,
--panel-applet > menubar menu {
--  font: regular;
--}
--
- .gnome-panel-menu-bar menuitem:hover,
- panel-applet > menubar menuitem:hover {
-   background-color: #4a90d9;
-+}
-+
-+.gnome-panel-menu-bar > menuitem > label,
-+panel-applet > menubar > menuitem > label,
-+clock-box label,
-+gp-calendar-window label,
-+#tasklist-button label,
-+#clock-applet-button label,
-+#showdesktop-button label {
-+  font: regular;
-+  color: #000000;
-+}
-+
-+.gnome-panel-menu-bar > menuitem:hover > label,
-+panel-applet > menubar > menuitem:hover > label {
-   color: #ffffff;
- }
- 
-@@ -27,7 +35,6 @@ panel-applet > menubar menuitem:hover {
- #clock-applet-button,
- #showdesktop-button {
-   padding: 0px 4px;
--  color: #000000;
-   border: 0;
-   border-radius: 0;
- }
-diff --git a/data/theme/HighContrast/gnome-panel.css b/data/theme/HighContrast/gnome-panel.css
-index 5cf1ec0..0e2e4e6 100644
---- a/data/theme/HighContrast/gnome-panel.css
-+++ b/data/theme/HighContrast/gnome-panel.css
-@@ -5,28 +5,38 @@ panel-plug {
- 
- .gnome-panel-menu-bar,
- panel-applet > menubar {
--  font: regular;
-   background: transparent;
--  color: #000000;
-   box-shadow: none;
- }
- 
--.gnome-panel-menu-bar menu,
--panel-applet > menubar menu {
--  font: regular;
--}
--
- .gnome-panel-menu-bar menuitem:hover,
- panel-applet > menubar menuitem:hover {
-   background-color: #000000;
-+}
-+
-+.gnome-panel-menu-bar > menuitem > label,
-+panel-applet > menubar > menuitem > label,
-+clock-box label,
-+gp-calendar-window label,
-+#tasklist-button label,
-+#clock-applet-button label,
-+#showdesktop-button label {
-+  font: regular;
-+  color: #000000;
-+}
-+
-+.gnome-panel-menu-bar > menuitem:hover > label,
-+panel-applet > menubar > menuitem:hover > label,
-+.gnome-panel-menu-bar > menuitem:hover > image,
-+panel-applet > menubar > menuitem:hover > image {
-   color: #ffffff;
- }
- 
-+
- #tasklist-button,
- #clock-applet-button,
- #showdesktop-button {
-   padding: 0px 4px;
--  color: #000000;
-   border: 0;
-   border-radius: 0;
- }
-@@ -35,6 +45,11 @@ panel-applet > menubar menuitem:hover {
- #clock-applet-button:checked,
- #showdesktop-button:checked {
-   background-color: #000000;
-+}
-+
-+#tasklist-button:checked label,
-+#clock-applet-button:checked label,
-+#showdesktop-button:checked label {
-   color: #ffffff;
- }
- 
--- 
-2.8.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-25 20:45:26 UTC (rev 171853)
+++ PKGBUILD	2016-04-25 20:59:47 UTC (rev 171854)
@@ -3,37 +3,22 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-panel
-pkgver=3.18.2
-pkgrel=3
+pkgver=3.20.0
+pkgrel=1
 pkgdesc="Panel of GNOME Flashback"
 arch=('i686' 'x86_64')
 url="https://wiki.gnome.org/Projects/GnomePanel"
 license=('GPL')
 depends=('evolution-data-server' 'gnome-desktop' 'gnome-menus' 'libwnck3')
-#makedepends=('intltool' 'itstool' 'gobject-introspection')
-makedepends=('intltool' 'itstool' 'gobject-introspection' 'gtk-doc' 'autoconf-archive')
+makedepends=('intltool' 'itstool' 'gobject-introspection')
 optdepends=('alacarte: Main menu editor'
             'gnome-applets: Extra applets for the panel')
 install=$pkgname.install
-#source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-source=(https://git.gnome.org/browse/gnome-panel/snapshot/gnome-panel-9814d539d3a858e4de831a9451cda66f0f947209.tar.xz
-        0001-Theme-set-font-settings-directly-on-label.patch)
-#sha256sums=('e2d8a51a2b9b3a4aa948647992f6fee23c3e69ec5639f2a824383e8a61fbac29')
-sha256sums=('6a3d2128a7963b1beeff284b1d5376bc3d227390b6cec15b271003809ee33598' SKIP)
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('feb5b83f6d9fbbe0885d30f779025f1ffa09ed6f49c8ea3d7d5967bd5a1ef6c2')
 
-prepare() {
-  cd $pkgname-*
-
-  # Theme: set font settings directly on label
-  # https://bugzilla.gnome.org/show_bug.cgi?id=764867
-  patch -Np1 -i ../0001-Theme-set-font-settings-directly-on-label.patch
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
 build() {
-#  cd $pkgname-$pkgver
-  cd $pkgname-*
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
               --disable-schemas-compile
 
@@ -44,7 +29,6 @@
 }
 
 package() {
-#  cd $pkgname-$pkgver
-  cd $pkgname-*
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }



More information about the arch-commits mailing list