summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--.gitignore2
-rw-r--r--PKGBUILD11
-rw-r--r--patch-src-mainframe.cpp42
4 files changed, 54 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3eadb8e29622..d79d939364bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = pcmanx-gtk2
pkgdesc = A gtk+ based free BBS client
pkgver = 1.3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/pcman-bbs/pcmanx
install = pcmanx.install
arch = i686
@@ -17,8 +17,9 @@ pkgbase = pcmanx-gtk2
options = !libtool
source = https://github.com/pcman-bbs/pcmanx/releases/download/1.3/pcmanx-gtk2-1.3.tar.xz
source = pcmanx.install
+ source = patch-src-mainframe.cpp
md5sums = 9796c55ca5df674251be713a5019e3bc
md5sums = 6374916400684c2db957be0250a4ca98
+ md5sums = 5de241f8226b7cc6aea6b184cdc7b9ea
pkgname = pcmanx-gtk2
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e08a70ebcf64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.pkg.tar.*
+*.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index ee512e7784db..ff0277213cb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=pcmanx-gtk2
pkgver=1.3
-pkgrel=1
+pkgrel=2
pkgdesc="A gtk+ based free BBS client"
arch=('i686' 'x86_64')
url="https://github.com/pcman-bbs/pcmanx"
@@ -14,14 +14,17 @@ optdepends=('wget')
makedepends=('autoconf' 'automake' 'intltool' 'pkg-config')
options=('!libtool')
source=(https://github.com/pcman-bbs/pcmanx/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz
- pcmanx.install)
+ pcmanx.install
+ patch-src-mainframe.cpp)
md5sums=('9796c55ca5df674251be713a5019e3bc'
- '6374916400684c2db957be0250a4ca98')
+ '6374916400684c2db957be0250a4ca98'
+ '5de241f8226b7cc6aea6b184cdc7b9ea')
install=pcmanx.install
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --enable-wget --enable-iplookup || return 1
+ patch -p1 < ${srcdir}/patch-src-mainframe.cpp
+ ./configure --prefix=/usr --enable-wget --enable-iplookup --enable-proxy || return 1
make || return 1
}
diff --git a/patch-src-mainframe.cpp b/patch-src-mainframe.cpp
new file mode 100644
index 000000000000..0c57eef2dc08
--- /dev/null
+++ b/patch-src-mainframe.cpp
@@ -0,0 +1,42 @@
+--- pcmanx-gtk2-1.3/src/mainframe.cpp.orig 2016-02-16 12:31:52 UTC
++++ pcmanx-gtk2-1.3/src/mainframe.cpp
+@@ -187,7 +187,7 @@ CMainFrame::CMainFrame()
+ LoadIcons();
+
+
+- gtk_window_set_title (GTK_WINDOW (m_Widget), "PCManX "VERSION );
++ gtk_window_set_title (GTK_WINDOW (m_Widget), "PCManX " VERSION );
+
+ m_pNotebook = new CNotebook();
+ gtk_notebook_set_scrollable(GTK_NOTEBOOK(m_pNotebook->m_Widget), TRUE);
+@@ -285,9 +285,9 @@ CTelnetCon* CMainFrame::NewCon(string ti
+ url = url.substr(first, last - first + 1);
+
+ /* Remove telnet:// from url */
+- first = url.find_first_not_of("telnet://");
+- if (first != string::npos)
+- url.erase(0, first);
++ const string telnetPrefix = "telnet://";
++ if(url.substr(0, telnetPrefix.size()) == telnetPrefix)
++ url.erase(0, telnetPrefix.size());
+
+ if ( site == NULL )
+ site = &AppConfig.m_DefaultSite;
+@@ -1677,7 +1677,7 @@ void CMainFrame::SetCurView(CTelnetView*
+ m_pView = view;
+ if( !m_pView || !m_pView->GetCon() )
+ {
+- gtk_window_set_title (GTK_WINDOW (m_Widget), "PCManX "VERSION );
++ gtk_window_set_title (GTK_WINDOW (m_Widget), "PCManX " VERSION );
+ gtk_entry_set_text( GTK_ENTRY(m_URLEntry), "");
+ return;
+ }
+@@ -1690,7 +1690,7 @@ void CMainFrame::SetCurView(CTelnetView*
+ if( ! con->IsClosed() )
+ m_pNotebook->SetPageTitle( m_pView, title );
+
+- title += " - PCManX "VERSION;
++ title += " - PCManX " VERSION;
+ gtk_window_set_title (GTK_WINDOW (m_Widget), title.c_str() );
+
+ char time_str[100];