From 5faadbf74292cfcd4032e78ba7a22f3be69035c5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 2 Jul 2022 22:00:15 +0200 Subject: [PATCH 1/3] New package: xfce4-mount-plugin-1.1.5 Upstream: https://github.com/dino/dino/commit/1309d7e2e42a1fdced3127c641f108fb72cc2fdd --- srcpkgs/dino/patches/quote.patch | 22 ++++++++++++++++++++++ srcpkgs/dino/template | 2 +- srcpkgs/xfce4-mount-plugin/template | 16 ++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/dino/patches/quote.patch create mode 100644 srcpkgs/xfce4-mount-plugin/template diff --git a/srcpkgs/dino/patches/quote.patch b/srcpkgs/dino/patches/quote.patch new file mode 100644 index 000000000000..7e469cf65180 --- /dev/null +++ b/srcpkgs/dino/patches/quote.patch @@ -0,0 +1,22 @@ +From 1309d7e2e42a1fdced3127c641f108fb72cc2fdd Mon Sep 17 00:00:00 2001 +From: fiaxh +Date: Mon, 14 Feb 2022 23:49:45 +0100 +Subject: [PATCH] Fix quote formating to not (partially) expect a space after > + +--- + main/src/ui/util/helper.vala | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala +index 51f0cc9c1..427c2d3a2 100644 +--- a/main/src/ui/util/helper.vala ++++ b/main/src/ui/util/helper.vala +@@ -259,7 +259,7 @@ public static string parse_add_markup_theme(string s_, string? highlight_word, b + theme_dependent = true; + quote_match_info.fetch_pos(0, out start, out end); + return parse_add_markup_theme(s[0:start], highlight_word, parse_links, parse_text_markup, parse_quotes, dark_theme, ref theme_dependent, already_escaped) + +- @"$gt " + parse_add_markup_theme(s[start + gt.length + 1:end], highlight_word, parse_links, parse_text_markup, false, dark_theme, ref theme_dependent, already_escaped) + "" + ++ @"$gt" + parse_add_markup_theme(s[start + gt.length:end], highlight_word, parse_links, parse_text_markup, false, dark_theme, ref theme_dependent, already_escaped) + "" + + parse_add_markup_theme(s[end:s.length], highlight_word, parse_links, parse_text_markup, parse_quotes, dark_theme, ref theme_dependent, already_escaped); + } + } diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template index 4c8255603289..3d4008790b24 100644 --- a/srcpkgs/dino/template +++ b/srcpkgs/dino/template @@ -1,7 +1,7 @@ # Template file for 'dino' pkgname=dino version=0.3.0 -revision=2 +revision=3 build_style=cmake configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON" hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel" diff --git a/srcpkgs/xfce4-mount-plugin/template b/srcpkgs/xfce4-mount-plugin/template new file mode 100644 index 000000000000..734b7af5fcea --- /dev/null +++ b/srcpkgs/xfce4-mount-plugin/template @@ -0,0 +1,16 @@ +# Template file for 'xfce4-mount-plugin' +pkgname=xfce4-mount-plugin +version=1.1.5 +revision=1 +build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" +hostmakedepends="pkg-config intltool" +makedepends="xfce4-panel-devel glibc-devel" +short_desc="Mount/umount utility for the Xfce4 panel" +maintainer="Ishaan Bhimwal " +license="GPL-2.0-or-later" +homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin" +changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mount-plugin/-/raw/master/NEWS" +distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/${version%.*}/xfce4-mount-plugin-${version}.tar.bz2" +checksum=584cd954929e542b3da0ff8d69e0325d8838dc39e7b32a509d1074ce3bb58ec2 + From a6b02cc6ca42eb0bc67e5d9176f708582d4f9e8c Mon Sep 17 00:00:00 2001 From: Ishaan Bhimwal Date: Mon, 4 Jul 2022 03:28:13 +0530 Subject: [PATCH 2/3] Delete quote.patch --- srcpkgs/dino/patches/quote.patch | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 srcpkgs/dino/patches/quote.patch diff --git a/srcpkgs/dino/patches/quote.patch b/srcpkgs/dino/patches/quote.patch deleted file mode 100644 index 7e469cf65180..000000000000 --- a/srcpkgs/dino/patches/quote.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 1309d7e2e42a1fdced3127c641f108fb72cc2fdd Mon Sep 17 00:00:00 2001 -From: fiaxh -Date: Mon, 14 Feb 2022 23:49:45 +0100 -Subject: [PATCH] Fix quote formating to not (partially) expect a space after > - ---- - main/src/ui/util/helper.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala -index 51f0cc9c1..427c2d3a2 100644 ---- a/main/src/ui/util/helper.vala -+++ b/main/src/ui/util/helper.vala -@@ -259,7 +259,7 @@ public static string parse_add_markup_theme(string s_, string? highlight_word, b - theme_dependent = true; - quote_match_info.fetch_pos(0, out start, out end); - return parse_add_markup_theme(s[0:start], highlight_word, parse_links, parse_text_markup, parse_quotes, dark_theme, ref theme_dependent, already_escaped) + -- @"$gt " + parse_add_markup_theme(s[start + gt.length + 1:end], highlight_word, parse_links, parse_text_markup, false, dark_theme, ref theme_dependent, already_escaped) + "" + -+ @"$gt" + parse_add_markup_theme(s[start + gt.length:end], highlight_word, parse_links, parse_text_markup, false, dark_theme, ref theme_dependent, already_escaped) + "" + - parse_add_markup_theme(s[end:s.length], highlight_word, parse_links, parse_text_markup, parse_quotes, dark_theme, ref theme_dependent, already_escaped); - } - } From e5073c9f19f2c1c4f8cd6539faad75240f77d2f1 Mon Sep 17 00:00:00 2001 From: Ishaan Bhimwal Date: Mon, 4 Jul 2022 03:28:31 +0530 Subject: [PATCH 3/3] Delete template --- srcpkgs/dino/template | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 srcpkgs/dino/template diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template deleted file mode 100644 index 3d4008790b24..000000000000 --- a/srcpkgs/dino/template +++ /dev/null @@ -1,31 +0,0 @@ -# Template file for 'dino' -pkgname=dino -version=0.3.0 -revision=3 -build_style=cmake -configure_args="-DDINO_PLUGIN_ENABLED_notification-sound=ON" -hostmakedepends="cmake ninja gettext unzip pkg-config vala glib-devel" -makedepends="glib-devel qrencode-devel gtk+3-devel gpgme-devel libgee08-devel - libgcrypt-devel libsoup-devel libsignal-protocol-c-devel sqlite-devel - libcanberra-devel gspell-devel libsrtp-devel libnice-devel gnutls-devel - gst-plugins-base1-devel" -short_desc='Modern XMPP ("Jabber") Chat Client using GTK+/Vala' -maintainer="Anjandev Momi " -license="GPL-3.0-or-later" -homepage="https://github.com/dino/dino" -distfiles="https://github.com/dino/dino/archive/v${version}.tar.gz" -checksum=110faee764bc9acbee0f5f4133e21eb25e6757ce81eb4b8d22dd113c7e4b5326 - -if [ "${XBPS_CHECK_PKGS}" ]; then - configure_args+=" -DBUILD_TESTS=ON" -fi - -do_check() { - build/xmpp-vala-test - build/signal-protocol-vala-test -} - -post_install() { - rm -rf ${DESTDIR}/usr/include - rm -rf ${DESTDIR}/usr/lib/*.so -}