Update to 0.7.7, remove obsolete patch

3 files changed, 12 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 814571a58346..400d82370e7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = font-manager
 	pkgdesc = A simple font management application for GTK+ Desktop Environments
-	pkgver = 0.7.5
-	pkgrel = 3
+	pkgver = 0.7.7
+	pkgrel = 1
 	url = http://fontmanager.github.io/
 	arch = i686
 	arch = x86_64
@@ -17,10 +17,8 @@ pkgbase = font-manager
 	depends = json-glib
 	depends = gtk3
 	optdepends = file-roller
-	source = https://github.com/FontManager/master/releases/download/0.7.5/font-manager-0.7.5.tar.xz
-	source = vala-basefontlist.patch
-	sha256sums = 9795212bdbf765e48662b2e8cb20bd232384c96f15a4c21dbc37643b2319cb30
-	sha256sums = e35a497813a46b2b58118fc6fc6f137fd185131b333a71d2d2eebef9d61affef
+	source = https://github.com/FontManager/master/releases/download/0.7.7/font-manager-0.7.7.tar.xz
+	sha256sums = f8e013f8168184cf62b73a6b0053a94daf8bb22aeecd4203904e5127632d90a2
 
 pkgname = font-manager
 
diff --git a/PKGBUILD b/PKGBUILD
index 6aa791ce3b4a..f68a16818564 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,32 +8,29 @@
 # Contributor: Pavlo <pavlofreemen(at)gmail(dot)com>
 
 pkgname=font-manager
-pkgver=0.7.5
-pkgrel=3
-pkgdesc="A simple font management application for GTK+ Desktop Environments"
+pkgver=0.7.7
+pkgrel=1
+pkgdesc='A simple font management application for GTK+ Desktop Environments'
 url="http://fontmanager.github.io/"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libxml2' 'sqlite' 'json-glib' 'gtk3')
 optdepends=('file-roller')
 makedepends=('intltool' 'yelp-tools' 'gobject-introspection' 'vala' 'meson' 'ninja')
-source=("https://github.com/FontManager/master/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
-        "vala-basefontlist.patch")
-sha256sums=('9795212bdbf765e48662b2e8cb20bd232384c96f15a4c21dbc37643b2319cb30'
-            'e35a497813a46b2b58118fc6fc6f137fd185131b333a71d2d2eebef9d61affef')
+source=("https://github.com/FontManager/master/releases/download/$pkgver/$pkgname-$pkgver.tar.xz")
+sha256sums=('f8e013f8168184cf62b73a6b0053a94daf8bb22aeecd4203904e5127632d90a2')
 
 prepare() {
-    cd "$srcdir/$pkgname-$pkgver"
-    patch -p0 < $srcdir/vala-basefontlist.patch
+    cd "$pkgname-$pkgver"
 }
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd "$pkgname-$pkgver"
     meson --prefix /usr --buildtype=debugoptimized build_dir
     ninja -v -C build_dir
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
+    cd "$pkgname-$pkgver"
     DESTDIR="$pkgdir" ninja -C build_dir install
 }
diff --git a/vala-basefontlist.patch b/vala-basefontlist.patch
deleted file mode 100644
index a9b935740c29..000000000000
--- a/vala-basefontlist.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/font-manager/FontList.vala~	2019-04-21 01:37:03.000000000 +0300
-+++ src/font-manager/FontList.vala	2019-10-29 10:18:43.148362381 +0300
-@@ -104,8 +104,10 @@
-         string default_sample;
-         string local_sample;
- 
--        public BaseFontList () {
--            Object(name: "BaseFontList", headers_visible: false, expand: true);
-+		construct {
-+			name = "BaseFontList";
-+			headers_visible = false;
-+			expand = true;
-             toggle = new Gtk.CellRendererToggle();
-             var text = new Gtk.CellRendererText();
-             var count = new CellRendererStyleCount();