[arch-commits] Commit in notes-up/trunk (3 files)

Thu Dec 23 12:52:24 UTC 2021

Date: Thursday, December 23, 2021 @ 12:52:23
  Author: arojas
Revision: 1083139

Update to 2.0.6

Modified:
  notes-up/trunk/PKGBUILD
Deleted:
  notes-up/trunk/0001-Add-missing-icon.patch
  notes-up/trunk/fix-build.patch

-----------------------------+
 0001-Add-missing-icon.patch |   48 ------------------------------------------
 PKGBUILD                    |   29 ++++++++-----------------
 fix-build.patch             |   22 -------------------
 3 files changed, 10 insertions(+), 89 deletions(-)

Deleted: 0001-Add-missing-icon.patch
===================================================================

--- 0001-Add-missing-icon.patch	2021-12-23 12:51:11 UTC (rev 1083138)
+++ 0001-Add-missing-icon.patch	2021-12-23 12:52:23 UTC (rev 1083139)
@@ -1,48 +0,0 @@
-From d28d8290e52135e2da909415062ddc04939123f9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Tue, 14 Jul 2020 22:10:15 +0200
-Subject: [PATCH] Add missing icon
-
-The tag-symbolic icon is missing from the default Adwaita icon theme. Add it from Elementary to provide fallback.
----
- data/assets.gresource.xml            |  1 +
- data/icons/symbolic/tag-symbolic.svg | 14 ++++++++++++++
- 2 files changed, 15 insertions(+)
- create mode 100644 data/icons/symbolic/tag-symbolic.svg
-
-diff --git a/data/assets.gresource.xml b/data/assets.gresource.xml
-index 354496f..ef2d1b1 100644
---- a/data/assets.gresource.xml
-+++ b/data/assets.gresource.xml
-@@ -11,6 +11,7 @@
-   </gresource>
-   <gresource prefix="/com/github/philip-scott/notes-up/icons">
-     <file alias="notebook-symbolic.svg" compressed="false" preprocess="">icons/symbolic/notebook-symbolic.svg</file>
-+    <file alias="tag-symbolic.svg" compressed="false" preprocess="">icons/symbolic/tag-symbolic.svg</file>
-   </gresource>
-   <gresource prefix="/com/github/philip-scott/notes-up/">
-     <file alias="Application.css" compressed="true">assets/stylesheets/app/Application.css</file>
-diff --git a/data/icons/symbolic/tag-symbolic.svg b/data/icons/symbolic/tag-symbolic.svg
-new file mode 100644
-index 0000000..9b192bf
---- /dev/null
-+++ b/data/icons/symbolic/tag-symbolic.svg
-@@ -0,0 +1,14 @@
-+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" height="16" width="16" id="svg2" version="1.1">
-+  <metadata id="metadata12">
-+    <rdf:RDF>
-+      <cc:Work rdf:about="">
-+        <dc:format>image/svg+xml</dc:format>
-+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-+        <dc:title/>
-+      </cc:Work>
-+    </rdf:RDF>
-+  </metadata>
-+  <defs id="defs10"/>
-+  <path style="fill:#666666;fill-rule:evenodd" id="path6" d="m 8.5,1 -7.25,7.75 6,6 L 15,7.5 15,3 C 15,1 13,1 13,1 Z M 12,3 c 1.333333,0 1.333333,2 0,2 -1.333333,0 -1.333333,-2 0,-2 z"/>
-+</svg>
-\ No newline at end of file
--- 
-2.27.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-23 12:51:11 UTC (rev 1083138)
+++ PKGBUILD	2021-12-23 12:52:23 UTC (rev 1083139)
@@ -3,32 +3,23 @@
 # Contributor: Matthew Sexton <wsdmatty (at) _gmail_ (dot) _com_>
 
 pkgname=notes-up
-pkgver=2.0.2
-pkgrel=4
+pkgver=2.0.6
+pkgrel=1
 pkgdesc='Write beautiful notes fast and easy using Markdown'
 arch=('x86_64')
 url='https://github.com/Philip-Scott/Notes-up'
 license=('GPL')
-depends=('discount' 'granite' 'gtksourceview3' 'gtkspell3' 'webkit2gtk')
-makedepends=('cmake' 'ninja' 'vala')
-source=("https://github.com/Philip-Scott/Notes-up/archive/$pkgver/Notes-up-$pkgver.tar.gz"
-        'fix-build.patch'
-        '0001-Add-missing-icon.patch')
-sha256sums=('35eb1df71034a118e66e6e00f5394c68423cfba7ceac035bde156d77da933b17'
-            'a0187a27ddf8a2203da65c63eff62c3dcd0beaa4ac10f2ed604951706f3db1e3'
-            '8f3dfb0f410b34a79b24a129e75e954414b06853519b000a4efc4be312d8c2fd')
+depends=('discount' 'granite' 'gtksourceview4' 'gtkspell3' 'webkit2gtk')
+makedepends=('meson' 'vala')
+source=("https://github.com/Philip-Scott/Notes-up/archive/$pkgver/Notes-up-$pkgver.tar.gz")
+sha256sums=('6e7b6ac4a3a917867a1555db0a6e03e40ccd9955b5d76e980a26fa8e40744f07')
 
-prepare() {
-  patch -d Notes-up-$pkgver -Np1 -i ../fix-build.patch
-  patch -d Notes-up-$pkgver -Np1 -i ../0001-Add-missing-icon.patch
-}
-
 build() {
-  cmake -S Notes-up-$pkgver -B build -G Ninja -DCMAKE_INSTALL_PREFIX='/usr' -Dnoele=1
-  cmake --build build
+  meson Notes-up-$pkgver build --prefix='/usr'
+  meson compile -C build
 }
 
 package() {
-  DESTDIR="$pkgdir" cmake --install build
-  ln -s com.github.philip-scott.notes-up "$pkgdir/usr/bin/$pkgname"
+  meson install -C build --destdir="$pkgdir"
+  ln -s com.github.philip_scott.notes-up "$pkgdir/usr/bin/$pkgname"
 }

Deleted: fix-build.patch
===================================================================
--- fix-build.patch	2021-12-23 12:51:11 UTC (rev 1083138)
+++ fix-build.patch	2021-12-23 12:52:23 UTC (rev 1083139)
@@ -1,22 +0,0 @@
-From 248c94feb79d6e4467bb0f9614bc0a1e2846f79c Mon Sep 17 00:00:00 2001
-From: Felipe Escoto Aceves <feescoto at microsoft.com>
-Date: Tue, 28 Apr 2020 09:35:41 -0700
-Subject: [PATCH] Add size to charArray in libmarkdown.vapi
-
----
- vapi/libmarkdown.vapi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vapi/libmarkdown.vapi b/vapi/libmarkdown.vapi
-index 81b5189..a6bf7e7 100644
---- a/vapi/libmarkdown.vapi
-+++ b/vapi/libmarkdown.vapi
-@@ -41,7 +41,7 @@ namespace Markdown
- 	public void initialize ();
- 	public void with_html5_tags ();
- 	public void shlib_destructor ();
--	public char markdown_version[];
-+	public char markdown_version[512];
- 
- 	[Compact]
- 	[CCode (cname = "MMIOT", cprefix = "mkd_", free_function = "mkd_cleanup")]

