diff options
| -rw-r--r-- | pcr/tootle/LICENSES.images | 1 | ||||
| -rw-r--r-- | pcr/tootle/PKGBUILD | 116 | ||||
| -rw-r--r-- | pcr/tootle/fix-build-on-vala-46.patch | 23 | ||||
| -rw-r--r-- | pcr/tootle/handle-unknown-message-types.patch | 56 | ||||
| -rw-r--r-- | pcr/tootle/horn.blend_.zip | bin | 0 -> 948047 bytes | |||
| -rw-r--r-- | pcr/tootle/tootle-horn-grey-128.png | bin | 8495 -> 0 bytes | |||
| -rw-r--r-- | pcr/tootle/tootle-horn-symbolic.png | bin | 0 -> 674 bytes | |||
| -rw-r--r-- | pcr/tootle/tootle-horn.xcf | bin | 52867 -> 55196 bytes |
8 files changed, 62 insertions, 134 deletions
diff --git a/pcr/tootle/LICENSES.images b/pcr/tootle/LICENSES.images index fb6cf56fe..4ca71772c 100644 --- a/pcr/tootle/LICENSES.images +++ b/pcr/tootle/LICENSES.images @@ -8,6 +8,7 @@ tootle-horn-64.png tootle-horn-128.png tootle-horn-grey-128.png Author: opengameart.org user 'mostafa' <https://opengameart.org/users/mostafa> + Contributor: bill-auger <bill-auger@programmer.net> License: GPLv3 Derived from: horn.blend_.zip::horn.png Fetched from: https://opengameart.org/content/horn diff --git a/pcr/tootle/PKGBUILD b/pcr/tootle/PKGBUILD index f075e5af3..7ea5555c6 100644 --- a/pcr/tootle/PKGBUILD +++ b/pcr/tootle/PKGBUILD @@ -1,73 +1,79 @@ # Maintainer: bill-auger <bill-auger@programmer.net> -# Contributor (AUR): Wesley Moore <wes@wezm.net> +# Maintainer (aur): Max Harmathy <max.harmathy@web.de> +# Contributor: Wesley Moore <wes@wezm.net> + # parabola changes and rationale: -# - replace images that are not clearly licensed +# - replace images that are not clearly licensed pkgname=tootle -pkgver=0.2.0 -pkgrel=2 +pkgver=1.0 +pkgrel=3 pkgdesc="GTK3 client for Mastodon federated services" -arch=('armv7h' 'x86_64' 'i686') -url=https://github.com/bleakgrey/tootle +arch=('armv7h' 'i686' 'x86_64') +url="https://github.com/bleakgrey/tootle" license=('GPL3') - -depends=('glib2' 'gtk3' 'hicolor-icon-theme' 'libsoup' 'granite' 'json-glib') -optdepends=('noto-fonts-emoji: color emoji') -makedepends=('git' 'desktop-file-utils' 'hicolor-icon-theme' 'intltool' 'yelp-tools' 'gnome-common' 'gobject-introspection' 'meson' 'ninja' 'vala') +depends=( + 'glib2' + 'granite' + 'gtk3' + 'hicolor-icon-theme' + 'json-glib' + 'libhandy' + 'libsoup' +) +optdepends=( + 'noto-fonts-emoji: color emoji' +) +makedepends=( + 'cmake' + 'desktop-file-utils' + 'git' + 'gnome-common' + 'gobject-introspection' + 'hicolor-icon-theme' + 'intltool' + 'meson' + 'ninja' + 'vala' + 'yelp-tools' +) options=('!libtool') -source=(https://github.com/bleakgrey/${pkgname}/archive/${pkgver}.tar.gz - fix-build-on-vala-46.patch - handle-unknown-message-types.patch - tootle-horn-16.png tootle-horn-24.png tootle-horn-32.png tootle-horn-48.png - tootle-horn-64.png tootle-horn-128.png tootle-horn-grey-128.png) -sha256sums=('e83c4a0539bf7b4b9d2b81d036ee0e8a69564b11c70f77ded5091955a89d2737' - '5158d1e2019eaf6f4fa043b8483f8dfa049335d572a2563a0d4f71f799cae2b0' - '6f28fe4169d5f596e3574fa717cc07c709659c653f6fee56fdfe370aa02d55c5' - 'd0f5575de5c73afc5b0db9c91c45762f4eb948b36b756bf45f5116cde91b42a8' - '6c3533b2e795d478047d3df477109c85aaa8aa1389db42341ec770823d595502' - '516b0358b6e9806c812331a8819567519cf54131566ca1450c251eced401eb11' - '2414fd5bf4dd435420f863dcfbe59a9184b2d1325fd4638b2db1180076440e23' - '9d8876aa02c3e4bdeb0c96f477aacd5f6eb7b9ddf5de0df62697e4b48a7b08d4' - 'bbd99b1209fd52b16a39ee94dca5538032f4eca8f66da18bed8acbfc74a7e1dc' - 'bc9a827d3d27e4ba394cd39c9e32b9a313a85254e47e54a71e8632b0c8ab2e5f') - -prepare() -{ - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 < ../fix-build-on-vala-46.patch - # FIXME: the program will crash if it gets any message of an unknown type - # there is a fix for this on the upstream master branch - # but it can not be back-ported onto release 0.2.0 - # this patch is adapted from a rejected merge request: - # https://github.com/bleakgrey/tootle/pull/143 - patch -p1 < ../handle-unknown-message-types.patch +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/bleakgrey/${pkgname}/archive/${pkgver}.tar.gz + tootle-horn-{16,24,32,48,64,128,256}.png tootle-horn-symbolic.png) +sha256sums=('e0a0a062b1b72010242f7bb4db97cd71190f23067188b5c07372264d768a0496') +sha256sums+=('d0f5575de5c73afc5b0db9c91c45762f4eb948b36b756bf45f5116cde91b42a8' + '6c3533b2e795d478047d3df477109c85aaa8aa1389db42341ec770823d595502' + '516b0358b6e9806c812331a8819567519cf54131566ca1450c251eced401eb11' + '2414fd5bf4dd435420f863dcfbe59a9184b2d1325fd4638b2db1180076440e23' + '9d8876aa02c3e4bdeb0c96f477aacd5f6eb7b9ddf5de0df62697e4b48a7b08d4' + 'bbd99b1209fd52b16a39ee94dca5538032f4eca8f66da18bed8acbfc74a7e1dc' + 'e359893f3d55b34d5d43ddc353944d5eeb57bee2acd44092de67dc7d4e84ce6b' + '0e3417208e269bb2a48d81fb45d851e1088d83abd6b9cc1ebc1f7b24297268d3') - sed -i "s|'\.svg'|'\.png'|" data/meson.build - for dims in 16 24 32 48 64 128 - do cp ${srcdir}/tootle-horn-${dims}.png data/icons/${dims}/com.github.bleakgrey.tootle.png - rm data/icons/${dims}/com.github.bleakgrey.tootle.svg - done - cp ${srcdir}/tootle-horn-grey-128.png data/empty_state.png - cp ${srcdir}/tootle-horn-128.png data/logo128.png - rm data/screenshot*.png -} -build() -{ - cd "${srcdir}/${pkgname}-${pkgver}" +build() { + cd "${srcdir}"/${pkgname}-${pkgver} - arch-meson -Db_pie=false build + arch-meson build ninja -C build } -package() -{ - cd "${srcdir}/${pkgname}-${pkgver}" +package() { + cd "${srcdir}"/${pkgname}-${pkgver} - DESTDIR="${pkgdir}/" ninja -C build install + DESTDIR="${pkgdir}"/ ninja -C build install - ln -s /usr/bin/com.github.bleakgrey.tootle ${pkgdir}/usr/bin/tootle + ln -s /usr/bin/com.github.bleakgrey.tootle "${pkgdir}"/usr/bin/tootle + + # replace logo images + local icons_dir="${pkgdir}"/usr/share/icons/hicolor/48x48/apps + local icon_filename=com.github.bleakgrey.tootle.png + find "${pkgdir}"/ -type f -name '*.png' -or -name '*.svg' -exec rm '{}' \; + install -Dm644 "${srcdir}"/tootle-horn-symbolic.png "${icons_dir}"/${icon_filename/.png/-symbolic.png} + for dims in {16,24,32,48,64,128,256} + do icons_dir="${pkgdir}"/usr/share/icons/hicolor/${dims}x${dims}/apps + install -Dm644 "${srcdir}"/tootle-horn-${dims}.png "${icons_dir}"/${icon_filename} + done } diff --git a/pcr/tootle/fix-build-on-vala-46.patch b/pcr/tootle/fix-build-on-vala-46.patch deleted file mode 100644 index 543c9443b..000000000 --- a/pcr/tootle/fix-build-on-vala-46.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0a88bdad6d969ead1e4058b1a19675c9d6857b16 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Mon, 14 Oct 2019 16:44:16 -0400 -Subject: [PATCH] Fix build with vala 0.46 - -See: https://gitlab.gnome.org/GNOME/vala/issues/766 ---- - src/Views/AbstractView.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Views/AbstractView.vala b/src/Views/AbstractView.vala -index e1c7f06..2945624 100644 ---- a/src/Views/AbstractView.vala -+++ b/src/Views/AbstractView.vala -@@ -21,7 +21,7 @@ public abstract class Tootle.AbstractView : ScrolledWindow { - }); - } - -- public AbstractView () { -+ protected AbstractView () { - show_all (); - } - diff --git a/pcr/tootle/handle-unknown-message-types.patch b/pcr/tootle/handle-unknown-message-types.patch deleted file mode 100644 index 4653b2675..000000000 --- a/pcr/tootle/handle-unknown-message-types.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/src/API/NotificationType.vala b/src/API/NotificationType.vala -index 53598b5..25c2b2c 100644 ---- a/src/API/NotificationType.vala -+++ b/src/API/NotificationType.vala -@@ -4,7 +4,8 @@ public enum Tootle.NotificationType { - FAVORITE, - FOLLOW, - FOLLOW_REQUEST, // Internal -- WATCHLIST; // Internal -+ WATCHLIST, // Internal -+ UNKNOWN; // Fallback - - public string to_string() { - switch (this) { -@@ -20,8 +21,9 @@ public enum Tootle.NotificationType { - return "follow_request"; - case WATCHLIST: - return "watchlist"; -+ case UNKNOWN: - default: -- assert_not_reached(); -+ return "unknown"; - } - } - -@@ -39,8 +41,9 @@ public enum Tootle.NotificationType { - return FOLLOW_REQUEST; - case "watchlist": - return WATCHLIST; -+ case "unknown": - default: -- assert_not_reached(); -+ return UNKNOWN; - } - } - -@@ -58,6 +61,8 @@ public enum Tootle.NotificationType { - return _("<a href=\"%s\"><b>%s</b></a> wants to follow you").printf (account.url, account.display_name); - case WATCHLIST: - return _("<a href=\"%s\"><b>%s</b></a> posted a toot").printf (account.url, account.display_name); -+ case UNKNOWN: -+ return _("<a href=\"%s\"><b>%s</b></a> posted an unrecognized type of message").printf (account.url, account.display_name); - default: - assert_not_reached(); - } -@@ -75,8 +80,9 @@ public enum Tootle.NotificationType { - case FOLLOW: - case FOLLOW_REQUEST: - return "contact-new-symbolic"; -+ case UNKNOWN: - default: -- assert_not_reached(); -+ return "dialog-warning"; - } - } - diff --git a/pcr/tootle/horn.blend_.zip b/pcr/tootle/horn.blend_.zip Binary files differnew file mode 100644 index 000000000..0b90d9ff8 --- /dev/null +++ b/pcr/tootle/horn.blend_.zip diff --git a/pcr/tootle/tootle-horn-grey-128.png b/pcr/tootle/tootle-horn-grey-128.png Binary files differdeleted file mode 100644 index e98608d51..000000000 --- a/pcr/tootle/tootle-horn-grey-128.png +++ /dev/null diff --git a/pcr/tootle/tootle-horn-symbolic.png b/pcr/tootle/tootle-horn-symbolic.png Binary files differnew file mode 100644 index 000000000..f75dc9190 --- /dev/null +++ b/pcr/tootle/tootle-horn-symbolic.png diff --git a/pcr/tootle/tootle-horn.xcf b/pcr/tootle/tootle-horn.xcf Binary files differindex 3a16c60e1..b23b0c238 100644 --- a/pcr/tootle/tootle-horn.xcf +++ b/pcr/tootle/tootle-horn.xcf |
