Add patches suggested by dmp1ce

4 files changed, 43 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62f6eb83d748..010ef7b8f904 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Sep 20 17:45:56 UTC 2018
+# Tue Jan 29 20:20:06 UTC 2019
 pkgbase = byobu
 	pkgdesc = Enhanced profile and useful notifications for tmux/screen
 	pkgver = 5.127
-	pkgrel = 1
+	pkgrel = 2
 	url = https://launchpad.net/byobu
 	install = byobu.install
 	arch = any
@@ -15,7 +15,11 @@ pkgbase = byobu
 	optdepends = screen: alternative back-end for byobu (default: tmux)
 	optdepends = python2: needed for byobu-config
 	source = https://launchpad.net/byobu/trunk/5.127/+download/byobu_5.127.orig.tar.gz
+	source = gnome3_desktop_application_not_starting.patch
+	source = non_ubuntu_color_fix.patch
 	md5sums = 18ddaa94dd2eccd7ff771c9050001056
+	md5sums = 23db3b90ae454c00384fcd3af8ad3020
+	md5sums = f93c4defa186db07bae329b3190b1d1a
 
 pkgname = byobu
 
diff --git a/PKGBUILD b/PKGBUILD
index 50b882c96da1..e5e0ff1e713a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=byobu
 pkgver=5.127
-pkgrel=1
+pkgrel=2
 pkgdesc="Enhanced profile and useful notifications for tmux/screen"
 arch=("any")
 url="https://launchpad.net/byobu"
@@ -14,8 +14,13 @@ install="byobu.install"
 makedepends=("gettext")
 optdepends=("screen: alternative back-end for byobu (default: tmux)"
             "python2: needed for byobu-config")
-source=("${url}/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz")
-md5sums=('18ddaa94dd2eccd7ff771c9050001056')
+source=("${url}/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz"
+"gnome3_desktop_application_not_starting.patch"
+"non_ubuntu_color_fix.patch"
+)
+md5sums=('18ddaa94dd2eccd7ff771c9050001056'
+         '23db3b90ae454c00384fcd3af8ad3020'
+         'f93c4defa186db07bae329b3190b1d1a')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -34,4 +39,7 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make install DESTDIR="$pkgdir"
+  cd "$pkgdir"
+  patch -p0 < "${srcdir}/gnome3_desktop_application_not_starting.patch"
+  patch -p0 < "${srcdir}/non_ubuntu_color_fix.patch"
 }
diff --git a/gnome3_desktop_application_not_starting.patch b/gnome3_desktop_application_not_starting.patch
new file mode 100644
index 000000000000..de18f188d81e
--- /dev/null
+++ b/gnome3_desktop_application_not_starting.patch
@@ -0,0 +1,13 @@
+=== modified file 'usr/share/byobu/desktop/byobu.desktop'
+--- usr/share/byobu/desktop/byobu.desktop	2018-08-12 14:10:27 +0000
++++ usr/share/byobu/desktop/byobu.desktop	2019-01-24 00:09:41 +0000
+@@ -2,7 +2,7 @@
+ Name=Byobu Terminal
+ Comment=Advanced Command Line and Text Window Manager
+ Icon=/usr/share/byobu/pixmaps/byobu.svg
+-Exec=gnome-terminal --app-id us.kirkland.terminals.byobu --class=us.kirkland.terminals.byobu -e byobu
++Exec=gnome-terminal --name=us.kirkland.terminals.byobu --class=us.kirkland.terminals.byobu -- byobu
+ Type=Application
+ Categories=GNOME;GTK;System;Utility;TerminalEmulator;
+ StartupWMClass=us.kirkland.terminals.byobu
+
diff --git a/non_ubuntu_color_fix.patch b/non_ubuntu_color_fix.patch
new file mode 100644
index 000000000000..6e9d57f7cf68
--- /dev/null
+++ b/non_ubuntu_color_fix.patch
@@ -0,0 +1,13 @@
+=== modified file 'usr/share/byobu/profiles/bashrc'
+--- usr/share/byobu/profiles/bashrc	2018-08-12 16:32:34 +0000
++++ usr/share/byobu/profiles/bashrc	2019-01-23 22:09:04 +0000
+@@ -54,7 +54,7 @@
+ 			;;
+ 			*)
+ 				# Use Googley colors (blue / red / yellow / blue / green / red )
+-                                PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[38;5;69m\]\u\[\e[38;5;214m\]@\[\e[38;5;167m\]\h\[\e[38;5;214m\]:\[\e[38;5;71m\]\w\[\e[38;5;214m\]\$(byobu_prompt_symbol)\e[00m\] "
++				PS1="${debian_chroot:+($debian_chroot)}\[\e[31m\]\$(byobu_prompt_status)\[\e[38;5;69m\]\u\[\e[38;5;214m\]@\[\e[38;5;167m\]\h\[\e[38;5;214m\]:\[\e[38;5;71m\]\w\[\e[38;5;214m\]\$(byobu_prompt_symbol)\[\e[00m\] "
+ 			;;
+ 		esac
+ 	fi
+