Update to gtklp-1.3.3.
This commit is contained in:
ajacoutot
parent
914b563b5c
commit
4c4ef00ca5
@ -1,16 +1,15 @@
|
||||
# $OpenBSD: Makefile,v 1.35 2017/02/18 17:33:51 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.36 2017/03/07 14:21:20 ajacoutot Exp $
|
||||
|
||||
COMMENT= GTK+2 frontend to CUPS
|
||||
COMMENT= GTK+ frontend to CUPS
|
||||
|
||||
DISTNAME= gtklp-1.3.1
|
||||
EXTRACT_SUFX= .src.tar.gz
|
||||
REVISION= 5
|
||||
DISTNAME= gtklp-1.3.3
|
||||
EXTRACT_SUFX= .src.tar.gz
|
||||
|
||||
CATEGORIES= print sysutils x11
|
||||
CATEGORIES= print sysutils x11
|
||||
|
||||
HOMEPAGE= http://gtklp.sirtobi.com/
|
||||
HOMEPAGE= http://gtklp.sirtobi.com/
|
||||
|
||||
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
@ -20,38 +19,36 @@ WANTLIB += Xrandr Xrender atk-1.0 avahi-client avahi-common c
|
||||
WANTLIB += cairo cups dbus-1 expat ffi fontconfig freetype gdk-x11-2.0
|
||||
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls
|
||||
WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz
|
||||
WANTLIB += hogweed m nettle p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0
|
||||
WANTLIB += pcre pixman-1 png pthread pthread-stubs tasn1 xcb xcb-render
|
||||
WANTLIB += xcb-shm z idn2
|
||||
WANTLIB += hogweed iconv idn2 intl m nettle p11-kit pango-1.0
|
||||
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
|
||||
WANTLIB += pthread-stubs tasn1 unistring xcb xcb-render xcb-shm
|
||||
WANTLIB += z
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtklp/}
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtklp/}
|
||||
|
||||
MODULES= devel/gettext
|
||||
|
||||
LIB_DEPENDS= x11/gtk+2 \
|
||||
print/cups,-libs
|
||||
LIB_DEPENDS= print/cups,-libs \
|
||||
x11/gtk+2
|
||||
|
||||
# package is only useful if cups is installed
|
||||
RUN_DEPENDS += print/cups
|
||||
RUN_DEPENDS += print/cups
|
||||
|
||||
USE_GMAKE= Yes
|
||||
USE_GMAKE= Yes
|
||||
|
||||
AUTOMAKE_VERSION=1.11
|
||||
AUTOCONF_VERSION=2.69
|
||||
# libtoolize(1)
|
||||
BUILD_DEPENDS+= devel/libtool \
|
||||
${MODGNU_AUTOMAKE_DEPENDS} \
|
||||
${MODGNU_AUTOCONF_DEPENDS}
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
CONFIGURE_STYLE=gnu
|
||||
AUTOMAKE_VERSION= 1.15
|
||||
AUTOCONF_VERSION= 2.69
|
||||
BUILD_DEPENDS += ${MODGNU_AUTOMAKE_DEPENDS} \
|
||||
${MODGNU_AUTOCONF_DEPENDS} \
|
||||
devel/libtool # libtoolize(1)
|
||||
|
||||
post-extract:
|
||||
find ${WRKSRC} -type f -name '*.orig' -exec rm {} \;
|
||||
rm ${WRKSRC}/po/de.po.orig
|
||||
|
||||
pre-configure:
|
||||
cd ${WRKSRC} && \
|
||||
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
|
||||
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
|
||||
autoreconf -i --force
|
||||
autoreconf -fi
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (gtklp-1.3.1.src.tar.gz) = c0+bDttPAf/OEohVMVCWYjElOlv0vXbbc57hgKHzn9s=
|
||||
SIZE (gtklp-1.3.1.src.tar.gz) = 641805
|
||||
SHA256 (gtklp-1.3.3.src.tar.gz) = bhBcIrjj6FW/ugYMsyhZWYQfBEOQd7ClM/FPaqUr+78=
|
||||
SIZE (gtklp-1.3.3.src.tar.gz) = 683524
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-gtklp_file_c,v 1.2 2015/04/05 14:26:54 ajacoutot Exp $
|
||||
|
||||
Fix display of file arguments passed on the cmdline
|
||||
|
||||
--- gtklp/file.c.orig Sun Apr 5 15:58:29 2015
|
||||
+++ gtklp/file.c Sun Apr 5 15:59:26 2015
|
||||
@@ -407,7 +407,7 @@ void FileFrame(GtkWidget *container)
|
||||
|
||||
for(i1 = 0; i1 < filesToPrintAnz; i1++)
|
||||
{
|
||||
- entry[0][0]=g_filename_to_utf8((gchar *)filesToPrint[i1],(size_t)MAXPATH,NULL,NULL,NULL);
|
||||
+ entry[0][0]=g_filename_to_utf8((gchar *)filesToPrint[i1],-1,NULL,NULL,NULL);
|
||||
gtk_clist_append(GTK_CLIST(fileList),entry[0]);
|
||||
g_free(entry[0][0]);
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-gtklp_gtklp_c,v 1.1 2015/01/16 11:28:42 ajacoutot Exp $
|
||||
|
||||
http://bugs.debian.org/644113
|
||||
|
||||
--- gtklp/gtklp.c.orig Wed Feb 26 20:31:06 2014
|
||||
+++ gtklp/gtklp.c Fri Jan 16 12:03:18 2015
|
||||
@@ -302,7 +302,7 @@ int main(int argc,char *argv[])
|
||||
case '?':
|
||||
if(calledGtkLP)
|
||||
{
|
||||
- g_print(str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n")));
|
||||
+ g_print("%s", str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n")));
|
||||
}
|
||||
return(0);
|
||||
break;
|
||||
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-include_defaults_h,v 1.6 2015/01/16 11:28:42 ajacoutot Exp $
|
||||
|
||||
http://bugs.debian.org/422266
|
||||
|
||||
--- include/defaults.h.orig Wed Feb 26 20:31:06 2014
|
||||
+++ include/defaults.h Fri Jan 16 12:01:50 2015
|
||||
@@ -72,7 +72,7 @@
|
||||
#define GTKLPRC_GLOBAL "gtklprc"
|
||||
|
||||
/* Constants */
|
||||
-#define DEF_PRN_LEN 50
|
||||
+#define DEF_PRN_LEN 256
|
||||
#define MAX_BANNER 20
|
||||
#ifdef PATH_MAX
|
||||
# define MAXPATH PATH_MAX
|
||||
@ -1,46 +0,0 @@
|
||||
$OpenBSD: patch-libgtklp_libgtklp_c,v 1.3 2015/01/16 11:28:42 ajacoutot Exp $
|
||||
|
||||
http://bugs.debian.org/644113
|
||||
|
||||
--- libgtklp/libgtklp.c.orig Wed Feb 26 20:31:06 2014
|
||||
+++ libgtklp/libgtklp.c Fri Jan 16 12:03:18 2015
|
||||
@@ -554,7 +554,7 @@ void passwin_response_ok(GtkEditable *editable, gpoint
|
||||
|
||||
const char *getPass (const char *prompt)
|
||||
{
|
||||
- GtkWidget *vbox, *hbox, *hbox1, *vbox1, *vbox2, *labell, *labelp, *yes, *no;
|
||||
+ GtkWidget *vbox, *hbox, *vbox1, *vbox2, *labell, *labelp;
|
||||
gint gi1;
|
||||
#if GTK_MAJOR_VERSION == 1
|
||||
GtkWidget *sep,*passwin;
|
||||
@@ -780,9 +780,6 @@ void exitOnError(char *gerror1, char *gerror2, int exi
|
||||
GtkWidget *exitErrorDialog;
|
||||
GtkWidget *hbox,*label,*pixmapwid;
|
||||
char tmplabel[MAXLINE+1];
|
||||
- GtkStyle *style;
|
||||
- GdkPixmap *pixmap;
|
||||
- GdkBitmap *mask;
|
||||
#if GTK_MAJOR_VERSION == 1
|
||||
GtkWidget *button,*vbox,*sep,*bbox;
|
||||
#endif
|
||||
@@ -826,9 +823,9 @@ void exitOnError(char *gerror1, char *gerror2, int exi
|
||||
gtk_widget_show(pixmapwid);
|
||||
|
||||
if(strlen(gerror2) == 0)
|
||||
- snprintf(tmplabel,(size_t)MAXLINE,gerror1);
|
||||
+ snprintf(tmplabel,(size_t)MAXLINE,"%s",gerror1);
|
||||
else
|
||||
- snprintf(tmplabel,(size_t)MAXLINE,gerror1,gerror2);
|
||||
+ snprintf(tmplabel,(size_t)MAXLINE,"%s\n%s",gerror1,gerror2);
|
||||
label=gtk_label_new(tmplabel);
|
||||
gtk_box_pack_end(GTK_BOX(hbox),label,FALSE, FALSE,FRAME_SPACING_V);
|
||||
gtk_widget_show(label);
|
||||
@@ -856,7 +853,7 @@ void exitOnError(char *gerror1, char *gerror2, int exi
|
||||
#endif
|
||||
} else {
|
||||
if(strlen(gerror2) == 0)
|
||||
- g_warning(gerror1);
|
||||
+ g_warning("%s",gerror1);
|
||||
else
|
||||
g_warning(gerror1,gerror2);
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-libgtklp_libgtklp_h,v 1.2 2013/03/15 07:40:30 ajacoutot Exp $
|
||||
|
||||
error: 'uintptr_t' undeclared
|
||||
|
||||
--- libgtklp/libgtklp.h.orig Mon Jun 22 10:07:45 2009
|
||||
+++ libgtklp/libgtklp.h Mon Jun 22 10:07:53 2009
|
||||
@@ -25,6 +25,7 @@
|
||||
#ifndef LIBGTKLP_H
|
||||
#define LIBGTKLP_H
|
||||
|
||||
+#include <stdint.h>
|
||||
#include <glib.h>
|
||||
#include <gtk/gtk.h>
|
||||
#ifndef _LOCALE_H
|
||||
Loading…
Reference in New Issue
Block a user