[arch-commits] Commit in eolie/repos/community-x86_64 (3 files)
Balló György
bgyorgy at archlinux.org
Mon Dec 24 17:28:24 UTC 2018
Date: Monday, December 24, 2018 @ 17:28:23
Author: bgyorgy
Revision: 417840
archrelease: copy trunk to community-x86_64
Added:
eolie/repos/community-x86_64/0001-Fix-AppStream-metadata-validation.patch
(from rev 417839, eolie/trunk/0001-Fix-AppStream-metadata-validation.patch)
eolie/repos/community-x86_64/PKGBUILD
(from rev 417839, eolie/trunk/PKGBUILD)
Deleted:
eolie/repos/community-x86_64/PKGBUILD
----------------------------------------------+
0001-Fix-AppStream-metadata-validation.patch | 49 +++++++++++++
PKGBUILD | 91 +++++++++++++------------
2 files changed, 98 insertions(+), 42 deletions(-)
Copied: eolie/repos/community-x86_64/0001-Fix-AppStream-metadata-validation.patch (from rev 417839, eolie/trunk/0001-Fix-AppStream-metadata-validation.patch)
===================================================================
--- 0001-Fix-AppStream-metadata-validation.patch (rev 0)
+++ 0001-Fix-AppStream-metadata-validation.patch 2018-12-24 17:28:23 UTC (rev 417840)
@@ -0,0 +1,49 @@
+From e33a0a0b3aed641483cb43cd697b9a81f2feac85 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Mon, 24 Dec 2018 17:12:14 +0000
+Subject: [PATCH] Fix AppStream metadata validation
+
+---
+ data/org.gnome.Eolie.appdata.xml.in | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/data/org.gnome.Eolie.appdata.xml.in b/data/org.gnome.Eolie.appdata.xml.in
+index b2c5463..c552d9d 100644
+--- a/data/org.gnome.Eolie.appdata.xml.in
++++ b/data/org.gnome.Eolie.appdata.xml.in
+@@ -1,8 +1,9 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<component type="desktop">
++<component type="desktop-application">
+ <id>org.gnome.Eolie</id>
+ <launchable type="desktop-id">org.gnome.Eolie.desktop</launchable>
+- <licence>CC0</licence>
++ <metadata_license>CC0-1.0</metadata_license>
++ <project_license>GPL-3.0+</project_license>
+ <name>Eolie</name>
+ <summary>Web browser</summary>
+ <description>
+@@ -17,16 +18,14 @@
+ </description>
+ </release>
+ </releases>
+- <categories>
+- <category>Web</category>
+- </categories>
+ <screenshots>
+- <screenshot type="default">https://adishatz.org/eolie.jpg</screenshot>
++ <screenshot type="default">
++ <image>https://adishatz.org/eolie.jpg</image>
++ </screenshot>
+ </screenshots>
+ <url type="homepage">https://wiki.gnome.org/Apps/Eolie</url>
+ <url type="bugtracker">https://gitlab.gnome.org/World/eolie/issues</url>
+ <url type="donation">https://www.paypal.me/lollypopgnome</url>
+ <url type="translate">https://hosted.weblate.org/projects/gnumdk/</url>
+- <content_rating type="oars-1.1" />
+- <updatecontact>cedric.bellegarde at adishatz.org</updatecontact>
++ <update_contact>cedric.bellegarde at adishatz.org</update_contact>
+ </component>
+--
+2.20.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-24 17:28:19 UTC (rev 417839)
+++ PKGBUILD 2018-12-24 17:28:23 UTC (rev 417840)
@@ -1,42 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Cédric Bellegarde cedric bellegarde at adishatz dot org
-
-pkgname=eolie
-pkgver=0.9.45
-pkgrel=1
-pkgdesc="Simple web browser for GNOME"
-arch=('x86_64')
-url="https://wiki.gnome.org/Apps/Eolie"
-license=('GPL3')
-depends=('gtkspell3' 'python-cairo' 'python-dateutil' 'python-gobject' 'webkit2gtk')
-makedepends=('git' 'gobject-introspection' 'meson')
-optdepends=('python-beautifulsoup4: Import html bookmarks'
- 'python-crypto: Firefox Sync support'
- 'python-fxa: Firefox Sync support'
- 'python-pyopenssl: Show SSL certificates'
- 'python-requests-hawk: Firefox Sync support')
-_commit=4cae6126129620b40396df9fd8e533434ec0eeee # tags/0.9.45
-source=("git+https://gitlab.gnome.org/World/eolie.git#commit=$_commit"
- "git+https://gitlab.gnome.org/gnumdk/eolie-po.git")
-sha256sums=('SKIP'
- 'SKIP')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
- git config submodule.subprojects/po.url "$srcdir/eolie-po"
- git submodule update --init
-}
-
-build() {
- arch-meson $pkgname build
- ninja -C build
-}
-
-package() {
- DESTDIR="$pkgdir" ninja -C build install
-}
Copied: eolie/repos/community-x86_64/PKGBUILD (from rev 417839, eolie/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-12-24 17:28:23 UTC (rev 417840)
@@ -0,0 +1,49 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Cédric Bellegarde cedric bellegarde at adishatz dot org
+
+pkgname=eolie
+pkgver=0.9.45
+pkgrel=2
+pkgdesc="Simple web browser for GNOME"
+arch=('x86_64')
+url="https://wiki.gnome.org/Apps/Eolie"
+license=('GPL3')
+depends=('gtkspell3' 'python-cairo' 'python-dateutil' 'python-gobject' 'webkit2gtk')
+makedepends=('git' 'gobject-introspection' 'meson')
+optdepends=('python-beautifulsoup4: Import html bookmarks'
+ 'python-crypto: Firefox Sync support'
+ 'python-fxa: Firefox Sync support'
+ 'python-pyopenssl: Show SSL certificates'
+ 'python-requests-hawk: Firefox Sync support')
+_commit=4cae6126129620b40396df9fd8e533434ec0eeee # tags/0.9.45
+source=("git+https://gitlab.gnome.org/World/eolie.git#commit=$_commit"
+ "git+https://gitlab.gnome.org/gnumdk/eolie-po.git"
+ 0001-Fix-AppStream-metadata-validation.patch)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'd32b04aaf035dd7c2e09b383f37537db7bd916c12c77eb31f81e0094976521a6')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+ git config submodule.subprojects/po.url "$srcdir/eolie-po"
+ git submodule update --init
+
+ # Fix AppStream metadata
+ # https://gitlab.gnome.org/World/eolie/merge_requests/271
+ git cherry-pick -n ba5cc5b90267bcbf9c6bf9b9c06ee45bd9ed9768
+ patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+}
+
+build() {
+ arch-meson $pkgname build
+ ninja -C build
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C build install
+}
More information about the arch-commits
mailing list