[arch-commits] Commit in gnome-software/repos/community-x86_64 (3 files)
Jan Steffens
heftig at archlinux.org
Thu Feb 8 16:26:10 UTC 2018
Date: Thursday, February 8, 2018 @ 16:26:09
Author: heftig
Revision: 290310
archrelease: copy trunk to community-x86_64
Added:
gnome-software/repos/community-x86_64/PKGBUILD
(from rev 290309, gnome-software/trunk/PKGBUILD)
Deleted:
gnome-software/repos/community-x86_64/0001-Fix-build-when-gtkspell-enabled.patch
gnome-software/repos/community-x86_64/PKGBUILD
--------------------------------------------+
0001-Fix-build-when-gtkspell-enabled.patch | 41 ---------
PKGBUILD | 113 ++++++++++++---------------
2 files changed, 54 insertions(+), 100 deletions(-)
Deleted: 0001-Fix-build-when-gtkspell-enabled.patch
===================================================================
--- 0001-Fix-build-when-gtkspell-enabled.patch 2018-02-08 16:20:28 UTC (rev 290309)
+++ 0001-Fix-build-when-gtkspell-enabled.patch 2018-02-08 16:26:09 UTC (rev 290310)
@@ -1,41 +0,0 @@
-From 88f0ba789a24973785444f18dc22e91ab38ea79e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=83=C2=B3=20Gy=C3=83=C2=B6rgy?= <ballogyor at gmail.com>
-Date: Thu, 18 Jan 2018 19:41:32 +0100
-Subject: [PATCH] Fix build when gtkspell enabled
-
-HAVE_GTKSPELL needs to be defined, otherwise the gtkspell related code never built.
----
- meson.build | 1 +
- src/meson.build | 4 ++++
- 2 files changed, 5 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 00f3b2ab..c20f8a6f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -125,6 +125,7 @@ endif
-
- if get_option('enable-gtkspell')
- gtkspell = dependency('gtkspell3-3.0')
-+ conf.set('HAVE_GTKSPELL', 1)
- endif
-
- if get_option('enable-polkit')
-diff --git a/src/meson.build b/src/meson.build
-index bf189241..c90366b3 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -100,6 +100,10 @@ if get_option('enable-gnome-desktop')
- gnome_software_dependencies += [gnome_desktop]
- endif
-
-+if get_option('enable-gtkspell')
-+ gnome_software_dependencies += [gtkspell]
-+endif
-+
- executable(
- 'gnome-software',
- resources_src,
---
-2.15.1
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-02-08 16:20:28 UTC (rev 290309)
+++ PKGBUILD 2018-02-08 16:26:09 UTC (rev 290310)
@@ -1,59 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Yosef Or Boczko <yoseforb at gnome.org>
-
-pkgbase=gnome-software
-pkgname=(gnome-software gnome-software-packagekit-plugin)
-pkgver=3.26.5
-pkgrel=2
-pkgdesc="GNOME Software Tools"
-arch=(x86_64)
-license=(GPL2)
-url="https://wiki.gnome.org/Apps/Software/"
-makedepends=(appstream-glib gnome-desktop gtkspell3 libpackagekit-glib flatpak fwupd ostree
- docbook-xsl git gobject-introspection gtk-doc meson valgrind)
-_commit=7424bad60e8336079eb7db639e0cc96c99d98354 # tags/3.26.5^0
-source=("git+https://git.gnome.org/browse/gnome-software#commit=$_commit"
- "0001-Fix-build-when-gtkspell-enabled.patch")
-sha256sums=('SKIP'
- 'c1c4e24d69625f444af32162319fd789f93ad761ea973c0035e5ca3ec761c10a')
-
-pkgver() {
- cd $pkgbase
- git describe --tags | sed 's/^GNOME_SOFTWARE_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
- cd $pkgbase
- # Fix build when gtkspell enabled
- # https://bugzilla.gnome.org/show_bug.cgi?id=792658
- patch -Np1 -i ../0001-Fix-build-when-gtkspell-enabled.patch
-}
-
-build() {
- arch-meson $pkgbase build -Denable-rpm=false -Denable-ubuntuone=false -Denable-ubuntu-reviews=false
- ninja -C build
-}
-
-package_gnome-software() {
- groups=('gnome')
- depends=(appstream-glib gnome-desktop gsettings-desktop-schemas gtkspell3 libpackagekit-glib)
- optdepends=('flatpak: Flatpak support plugin'
- 'fwupd: fwupd support plugin'
- 'ostree: OSTree support plugin')
-
- DESTDIR="$pkgdir" ninja -C build install
-
- # Split out packagekit plugin
- mkdir "$srcdir"/packagekit-plugin
- mv "$pkgdir"/usr/lib/gs-plugins-11/libgs_plugin_{packagekit*,systemd-updates}.so "$srcdir"/packagekit-plugin
-}
-
-package_gnome-software-packagekit-plugin() {
- pkgdesc="PackageKit support plugin for GNOME Software"
- depends=(archlinux-appstream-data gnome-software packagekit)
-
- mkdir -p "$pkgdir"/usr/lib/gs-plugins-11
- mv "$srcdir"/packagekit-plugin/* "$pkgdir"/usr/lib/gs-plugins-11/
-}
Copied: gnome-software/repos/community-x86_64/PKGBUILD (from rev 290309, gnome-software/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-02-08 16:26:09 UTC (rev 290310)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Yosef Or Boczko <yoseforb at gnome.org>
+
+pkgbase=gnome-software
+pkgname=(gnome-software gnome-software-packagekit-plugin)
+pkgver=3.26.6
+pkgrel=1
+pkgdesc="GNOME Software Tools"
+arch=(x86_64)
+license=(GPL2)
+url="https://wiki.gnome.org/Apps/Software/"
+makedepends=(appstream-glib gnome-desktop gtkspell3 libpackagekit-glib flatpak fwupd ostree
+ docbook-xsl git gobject-introspection gtk-doc meson valgrind)
+_commit=16585115a93f20560d08bc5f53b3ca123174c650 # tags/3.26.6^0
+source=("git+https://gitlab.gnome.org/GNOME/gnome-software.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd $pkgbase
+ git describe --tags | sed 's/^GNOME_SOFTWARE_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+ cd $pkgbase
+}
+
+build() {
+ arch-meson $pkgbase build -Denable-rpm=false -Denable-ubuntuone=false -Denable-ubuntu-reviews=false
+ ninja -C build
+}
+
+package_gnome-software() {
+ groups=('gnome')
+ depends=(appstream-glib gnome-desktop gsettings-desktop-schemas gtkspell3 libpackagekit-glib)
+ optdepends=('flatpak: Flatpak support plugin'
+ 'fwupd: fwupd support plugin'
+ 'ostree: OSTree support plugin')
+
+ DESTDIR="$pkgdir" ninja -C build install
+
+ # Split out packagekit plugin
+ mkdir "$srcdir"/packagekit-plugin
+ mv "$pkgdir"/usr/lib/gs-plugins-11/libgs_plugin_{packagekit*,systemd-updates}.so "$srcdir"/packagekit-plugin
+}
+
+package_gnome-software-packagekit-plugin() {
+ pkgdesc="PackageKit support plugin for GNOME Software"
+ depends=(archlinux-appstream-data gnome-software packagekit)
+
+ mkdir -p "$pkgdir"/usr/lib/gs-plugins-11
+ mv "$srcdir"/packagekit-plugin/* "$pkgdir"/usr/lib/gs-plugins-11/
+}
More information about the arch-commits
mailing list