Elementary Tweaks (minus pantheon-terminal opacity setting)

4 files changed, 49 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31bb9cb0f1fd..959bc5fc2cc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri Mar 17 03:56:35 UTC 2017
 pkgbase = switchboard-plug-elementary-tweaks-bzr
 	pkgdesc = Elementary Tweaks plug for Switchboard
-	pkgver = r251
+	pkgver = r276
 	pkgrel = 1
 	url = https://launchpad.net/elementary-tweaks
 	arch = i686
@@ -18,9 +20,12 @@ pkgbase = switchboard-plug-elementary-tweaks-bzr
 	depends = libgranite.so
 	depends = libswitchboard-2.0.so
 	provides = switchboard-plug-elementary-tweaks
+	provides = switchboard-plug-elementary-tweaks-bzr
 	conflicts = switchboard-plug-elementary-tweaks
 	source = switchboard-plug-elementary-tweaks::bzr+lp:elementary-tweaks
+	source = opacity.patch
 	sha256sums = SKIP
+	sha256sums = e9a73d0b7b57178b676e3c563db5559dc83469debadf83855a8639999cb370cc
 
 pkgname = switchboard-plug-elementary-tweaks-bzr
 
diff --git a/MKPKG b/MKPKG
deleted file mode 100644
index a65e54d2134c..000000000000
--- a/MKPKG
+++ /dev/null
@@ -1,6 +0,0 @@
-pkgname=('switchboard-plug-elementary-tweaks-bzr')
-builddeps=('granite-bzr' 'switchboard-bzr')
-
-check_bzr $packagedir/$pkgname/${pkgname%-*}
-
-# vim: ts=2 sw=2 et:
diff --git a/PKGBUILD b/PKGBUILD
index 9a7a58fe4404..e91e7feb6670 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Maxime Gauduin <alucryd@archlinux.org>
+# Maintainer: Que Quotion <quequotion@bugmenot.com>
+# Contributor: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=switchboard-plug-elementary-tweaks-bzr
-pkgver=r251
+pkgver=r276
 pkgrel=1
 pkgdesc='Elementary Tweaks plug for Switchboard'
 arch=('i686' 'x86_64')
@@ -11,10 +12,12 @@ groups=('pantheon-unstable')
 depends=('gconf' 'glib2' 'glibc' 'gtk3' 'libgee'
          'libgranite.so' 'libswitchboard-2.0.so')
 makedepends=('bzr' 'cmake' 'vala')
-provides=('switchboard-plug-elementary-tweaks')
+provides=(switchboard-plug-elementary-tweaks{,-bzr})
 conflicts=('switchboard-plug-elementary-tweaks')
-source=('switchboard-plug-elementary-tweaks::bzr+lp:elementary-tweaks')
-sha256sums=('SKIP')
+source=('switchboard-plug-elementary-tweaks::bzr+lp:elementary-tweaks'
+        'opacity.patch')
+sha256sums=('SKIP'
+            'e9a73d0b7b57178b676e3c563db5559dc83469debadf83855a8639999cb370cc')
 
 pkgver() {
   cd switchboard-plug-elementary-tweaks
@@ -22,6 +25,10 @@ pkgver() {
   echo "r$(bzr revno)"
 }
 
+prepare() {
+  patch -Np1 < opacity.patch
+}
+
 build() {
   cd switchboard-plug-elementary-tweaks
 
diff --git a/opacity.patch b/opacity.patch
new file mode 100644
index 000000000000..6d1e6399ffef
--- /dev/null
+++ b/opacity.patch
@@ -0,0 +1,31 @@
+--- src/switchboard-plug-elementary-tweaks/src/Grids/TerminalGrid.vala	2016-10-19 23:53:06.686331000 +0900
++++ src/switchboard-plug-elementary-tweaks/src/Grids/TerminalGrid.vala.new	2016-10-20 00:01:41.754521681 +0900
+@@ -145,18 +145,6 @@
+             this.row_spacing = 6;
+             this.halign = Gtk.Align.CENTER;
+ 
+-            // Terminal Opacity tweak
+-            var opacity = new TweakWidget.with_spin_button (
+-                        _("Opacity:"),
+-                        _("How transparent the background of the terminal is"),
+-                        null,
+-                        (() => { return TerminalSettings.get_default ().opacity ; }), // get
+-                        ((val) => { TerminalSettings.get_default ().opacity = val; }), // set
+-                        (() => { TerminalSettings.get_default ().schema.reset ("opacity"); }), // reset
+-                        0, 100, 1
+-                    );
+-            this.add (opacity);
+-
+             // Terminal Theme
+             var default_themes = TerminalTheme.get_default_themes ();
+             var theme_map = new Gee.HashMap<string, string> ();
+--- src/switchboard-plug-elementary-tweaks/src/Settings/TerminalSettings.vala	2016-10-19 23:53:06.686331000 +0900
++++ src/switchboard-plug-elementary-tweaks/src/Settings/TerminalSettings.vala.new	2016-10-19 23:58:33.220030172 +0900
+@@ -24,7 +24,6 @@
+         public string cursor_color { get; set; }
+         public string font { get; set; }
+         public string foreground { get; set; }
+-        public int opacity { get; set; }
+         public string palette { get; set; }
+         public int scrollback_lines { get; set; }
+