[arch-commits] Commit in pcurses/trunk (PKGBUILD pcurses-5-ncurses_6.3.patch)

[David Runge]

    Date: Thursday, December 30, 2021 @ 12:51:30
  Author: dvzrv
Revision: 1088231

upgpkg: pcurses 5-5: Rebuild packages maintained by schuay

Added:
  pcurses/trunk/pcurses-5-ncurses_6.3.patch
Modified:
  pcurses/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   36 +++++++++++++++++++++++-------------
 pcurses-5-ncurses_6.3.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-30 12:48:41 UTC (rev 1088230)
+++ PKGBUILD	2021-12-30 12:51:30 UTC (rev 1088231)
@@ -2,28 +2,38 @@
 
 pkgname=pcurses
 pkgver=5
-pkgrel=4
+pkgrel=5
 pkgdesc='A curses package management tool using libalpm'
 arch=('x86_64')
 url="https://github.com/schuay/$pkgname"
-license=('GPL')
+license=('GPL2')
 depends=('ncurses' 'pacman')
-makedepends=('boost' 'cmake' 'git')
-source=("git://github.com/schuay/pcurses.git#tag=pcurses-$pkgver")
-md5sums=('SKIP')
+makedepends=('boost' 'cmake')
+source=(
+ "$pkgname-$pkgver.tar.gz::https://github.com/schuay/pcurses/archive/refs/tags/${pkgname}-${pkgver}.tar.gz"
+ "${pkgname}-5-ncurses_6.3.patch"
+)
+sha512sums=('21700041eee3edd73f5321e03a7700abf0cf78b2c22675a7e2076b49a58ba6c77cb66fa0b81297c64347549a459143b803ca82183f0be7d8192406ffc45e2393'
+            'b873fdffd56edd3e506196829327826194cc20be162c266531899a017e3ec801e21a979b3f53799467761fe4ea3c65f5180751ec23582147840b28cc12a37aaa')
+b2sums=('1f0d1abe65713acac4a1ef4d5fa25656b1eb93fc699720f694114f97c3a90b173948a3085d791a1cc00487354290608a1f726b2dbd94f12aa54f0d27d4747c3b'
+        'b4020c24e77bd324603d5b0d5c20368a966f3158711035dc7e70914da8ad97140d3aeb6576174d9c191f4dfc3cb4efd273802a6f98750881a10d771e5d015fa7')
 
+prepare() {
+  cd "${pkgname}-${pkgname}-${pkgver}"
+  patch -Np1 -i ../"${pkgname}-5-ncurses_6.3.patch"
+}
+
 build() {
-  rm -rf "$srcdir/$pkgname-build"
-  mkdir "$srcdir/$pkgname-build"
-  cd "$srcdir/$pkgname-build"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr "$srcdir/$pkgname"
-  make
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=None \
+        -W no-dev \
+        -B build \
+        -S "${pkgname}-${pkgname}-${pkgver}"
+  make VERBOSE=1 -C build
 }
 
 package() {
-  cd "$srcdir/$pkgname-build"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install -C build
 }
 
 # vim:set ts=2 sw=2 et:

Added: pcurses-5-ncurses_6.3.patch
===================================================================
--- pcurses-5-ncurses_6.3.patch	                        (rev 0)
+++ pcurses-5-ncurses_6.3.patch	2021-12-30 12:51:30 UTC (rev 1088231)
@@ -0,0 +1,35 @@
+diff --git i/src/cursesframe.cpp w/src/cursesframe.cpp
+index 70c9102..95fc31d 100644
+--- i/src/cursesframe.cpp
++++ w/src/cursesframe.cpp
+@@ -93,10 +93,10 @@ void CursesFrame::refresh()
+ 
+         int headercol = focused ? C_INV : C_DEF;
+         wattron(w_border, A_BOLD | headercol);
+-        mvwprintw(w_border, 0, 1, header.c_str());
++        mvwprintw(w_border, 0, 1, "%s", header.c_str());
+         wattroff(w_border, A_BOLD | headercol);
+ 
+-        mvwprintw(w_border, w_border->_maxy, 1, footer.c_str());
++        mvwprintw(w_border, w_border->_maxy, 1, "%s", footer.c_str());
+ 
+         wnoutrefresh(w_border);
+     }
+@@ -108,7 +108,7 @@ void CursesFrame::printw(string str, int attr)
+     if (attr != 0) {
+         wattron(w_main, attr);
+     }
+-    wprintw(w_main, fitstrtowin(str).c_str());
++    wprintw(w_main, "%s", fitstrtowin(str).c_str());
+     if (attr != 0) {
+         wattroff(w_main, attr);
+     }
+@@ -119,7 +119,7 @@ void CursesFrame::mvprintw(int x, int y, string str, int attr)
+     if (attr != 0) {
+         wattron(w_main, attr);
+     }
+-    mvwprintw(w_main, y, x, fitstrtowin(str, x).c_str());
++    mvwprintw(w_main, y, x, "%s", fitstrtowin(str, x).c_str());
+     if (attr != 0) {
+         wattroff(w_main, attr);
+     }