Update to sakura-3.5.0

Build as -std=gnu99 and remove the patch.
From new MAINTAINER Victor Kukshiev <andrey0bolkonsky AT gmail DOT com>
This commit is contained in:
bcallah 2018-04-28 18:22:55 +00:00
parent 43e37a4c12
commit 7b5fb77f82
3 changed files with 7 additions and 53 deletions

View File

@ -1,12 +1,13 @@
# $OpenBSD: Makefile,v 1.19 2017/06/11 15:14:18 jasper Exp $
# $OpenBSD: Makefile,v 1.20 2018/04/28 18:22:55 bcallah Exp $
V = 3.4.0
V = 3.5.0
COMMENT = GTK and VTE based terminal emulator
DISTNAME = sakura-${V}
EXTRACT_SUFX = .tar.bz2
CATEGORIES = x11
HOMEPAGE = http://www.pleyades.net/david/projects/sakura/
MAINTAIMER = Victor Kukshiev <andrey0bolkonsky@gmail.com>
# GPLv2 only
PERMIT_PACKAGE_CDROM = Yes
@ -26,6 +27,8 @@ LIB_DEPENDS = devel/gettext \
RUN_DEPENDS = devel/desktop-file-utils
CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS} -std=gnu99"
NO_TEST = Yes
pre-configure:

View File

@ -1,2 +1,2 @@
SHA256 (sakura-3.4.0.tar.bz2) = BEh1EQSdWWhW1wDVJMM1RhDHyq6LuHujwWhRNW0/QO4=
SIZE (sakura-3.4.0.tar.bz2) = 54907
SHA256 (sakura-3.5.0.tar.bz2) = 6zDt5BCD/aKwfGo7c5MVD0iGfoHSjvcLFYJHQMqwDDo=
SIZE (sakura-3.5.0.tar.bz2) = 55432

View File

@ -1,49 +0,0 @@
$OpenBSD: patch-src_sakura_c,v 1.4 2017/06/12 16:40:26 jasper Exp $
error: 'for' loop initial declaration used outside C99 mode
Index: src/sakura.c
--- src/sakura.c.orig
+++ src/sakura.c
@@ -1343,9 +1343,10 @@ sakura_color_dialog (GtkWidget *widget, void *data)
static void
sakura_fade_out()
{
+ int i;
GdkRGBA x = sakura.forecolors[sakura.last_colorset-1];
if( (x.red + x.green + x.blue) / 3.0 > 0.5) {
- for( int i=0; i<NUM_COLORSETS; i++) {
+ for( i=0; i<NUM_COLORSETS; i++) {
GdkRGBA x = sakura.forecolors[i];
x.red = x.red/100.0 * FADE_PERCENT;
x.green = x.green/100.0 * FADE_PERCENT;
@@ -1353,7 +1354,7 @@ sakura_fade_out()
sakura.forecolors[i]=x;
}
} else {
- for( int i=0; i<NUM_COLORSETS; i++) {
+ for( i=0; i<NUM_COLORSETS; i++) {
GdkRGBA x = sakura.forecolors[i];
x.red = 1.0-x.red/100.0 * FADE_PERCENT;
x.green = 1.0-x.green/100.0 * FADE_PERCENT;
@@ -1366,9 +1367,10 @@ sakura_fade_out()
static void
sakura_fade_in()
{
+ int i;
GdkRGBA x = sakura.forecolors[sakura.last_colorset-1];
if( (x.red + x.green + x.blue) / 3.0 > 0.5) {
- for( int i=0; i<NUM_COLORSETS; i++) {
+ for( i=0; i<NUM_COLORSETS; i++) {
GdkRGBA x = sakura.forecolors[i];
x.red = x.red/FADE_PERCENT * 100.0;
x.green = x.green/FADE_PERCENT * 100.0;
@@ -1376,7 +1378,7 @@ sakura_fade_in()
sakura.forecolors[i]=x;
}
} else {
- for( int i=0; i<NUM_COLORSETS; i++) {
+ for( i=0; i<NUM_COLORSETS; i++) {
GdkRGBA x = sakura.forecolors[i];
x.red = 1.0-x.red/FADE_PERCENT * 100.0;
x.green = 1.0-x.green/FADE_PERCENT * 100.0;