svn commit: r566736 - in head/security/gringotts: . files
Christian Weisgerber
naddy at FreeBSD.org
Sat Feb 27 21:37:41 UTC 2021
Author: naddy
Date: Sat Feb 27 21:37:38 2021
New Revision: 566736
URL: https://svnweb.freebsd.org/changeset/ports/566736
Log:
security/gringotts: fix build on FreeBSD 13/14
Also fix up dependencies while here.
Added:
head/security/gringotts/files/patch-src_grg__attachs.h (contents, props changed)
head/security/gringotts/files/patch-src_grg__entries.h (contents, props changed)
head/security/gringotts/files/patch-src_grg__menus.c (contents, props changed)
head/security/gringotts/files/patch-src_grg__menus.h (contents, props changed)
head/security/gringotts/files/patch-src_grg__pix.h (contents, props changed)
head/security/gringotts/files/patch-src_grg__prefs.h (contents, props changed)
head/security/gringotts/files/patch-src_grg__recent__dox.h (contents, props changed)
head/security/gringotts/files/patch-src_grg__widgets.h (contents, props changed)
head/security/gringotts/files/patch-src_gringotts.h (contents, props changed)
Modified:
head/security/gringotts/Makefile
Modified: head/security/gringotts/Makefile
==============================================================================
--- head/security/gringotts/Makefile Sat Feb 27 20:30:01 2021 (r566735)
+++ head/security/gringotts/Makefile Sat Feb 27 21:37:38 2021 (r566736)
@@ -3,7 +3,7 @@
PORTNAME= gringotts
PORTVERSION= 1.2.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= BERLIOS
@@ -13,14 +13,13 @@ COMMENT= GTK application to securely store sensitive d
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN_FreeBSD_13= ld: error: duplicate symbol: clip_xpm
-BROKEN_FreeBSD_14= ld: error: duplicate symbol: clip_xpm
-
LIB_DEPENDS= libpopt.so:devel/popt \
- libgringotts.so:security/libgringotts
+ libgringotts.so:security/libgringotts \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfreetype.so:print/freetype2
USES= gettext gnome localbase pkgconfig
-USE_GNOME= gtk20
+USE_GNOME= cairo gdkpixbuf2 gtk20
GNU_CONFIGURE= yes
OPTIONS_DEFINE= DOCS
Added: head/security/gringotts/files/patch-src_grg__attachs.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_grg__attachs.h Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,11 @@
+--- src/grg_attachs.h.orig 2008-01-04 13:08:44 UTC
++++ src/grg_attachs.h
+@@ -24,7 +24,7 @@
+
+ #include <gtk/gtk.h>
+
+-gint current_attach_ID;
++extern gint current_attach_ID;
+
+ gint grg_attach_file (gchar * path, GtkWidget * parent);
+ void grg_remove_attachment (void);
Added: head/security/gringotts/files/patch-src_grg__entries.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_grg__entries.h Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,11 @@
+--- src/grg_entries.h.orig 2008-01-04 13:08:43 UTC
++++ src/grg_entries.h
+@@ -24,7 +24,7 @@
+
+ /* current element. */
+ /* MUST BE USED ONLY BY grg_attachs.h !!!! */
+-GList *current;
++extern GList *current;
+
+ /* Appends a new entry to the list */
+ void grg_entries_append (void);
Added: head/security/gringotts/files/patch-src_grg__menus.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_grg__menus.c Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,15 @@
+--- src/grg_menus.c.orig 2008-01-04 13:08:44 UTC
++++ src/grg_menus.c
+@@ -31,6 +31,12 @@
+
+ #include <gdk/gdkkeysyms.h>
+
++GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
++GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref;
++GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
++GtkWidget *bwipe;
++GtkWidget *babo;
++
+ #define NEW_MENU_ITEM(var, text, cb, data, parent, img, key, mod) \
+ var = gtk_image_menu_item_new_with_mnemonic(text); \
+ gtk_menu_shell_append (GTK_MENU_SHELL (parent), var); \
Added: head/security/gringotts/files/patch-src_grg__menus.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_grg__menus.h Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,27 @@
+--- src/grg_menus.h.orig 2008-01-04 13:08:44 UTC
++++ src/grg_menus.h
+@@ -25,19 +25,19 @@
+ #include <gtk/gtk.h>
+
+ /* menu File */
+-GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
++extern GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit;
+
+ /* menu Edit */
+-GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref;
++extern GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref;
+
+ /* menu Navigation */
+-GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
++extern GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind;
+
+ /* menu Tools */
+-GtkWidget *bwipe;
++extern GtkWidget *bwipe;
+
+ /* menu Help */
+-GtkWidget *babo;
++extern GtkWidget *babo;
+
+ /*Makes a menubar, within a handlebox, and returns the GtkWidget */
+ GtkWidget *grg_menu_create (GtkWidget * window);
Added: head/security/gringotts/files/patch-src_grg__pix.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_grg__pix.h Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,23 @@
+--- src/grg_pix.h.orig 2008-01-04 13:08:43 UTC
++++ src/grg_pix.h
+@@ -22,13 +22,13 @@
+ #ifndef GRG_PIX_H
+ #define GRG_PIX_H
+
+-const char *red_xpm[58];
+-const char *yellow_xpm[58];
+-const char *green_xpm[58];
+-const char *optimal_xpm[94];
++extern const char *red_xpm[58];
++extern const char *yellow_xpm[58];
++extern const char *green_xpm[58];
++extern const char *optimal_xpm[94];
+
+-const char *splash_xpm[180];
++extern const char *splash_xpm[180];
+
+-const char *wait_xpm[82];
+-const char *clip_xpm[17];
++extern const char *wait_xpm[82];
++extern const char *clip_xpm[17];
+ #endif
Added: head/security/gringotts/files/patch-src_grg__prefs.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_grg__prefs.h Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,27 @@
+--- src/grg_prefs.h.orig 2008-09-01 16:06:36 UTC
++++ src/grg_prefs.h
+@@ -24,15 +24,15 @@
+
+ #include <gtk/gtk.h>
+
+-gboolean grg_prefs_warn4overwrite;
+-gboolean grg_prefs_bak_files;
+-gboolean grg_prefs_splash;
+-gboolean grg_prefs_tray;
+-gboolean grg_prefs_clip_clear_on_close;
+-gboolean grg_prefs_clip_clear_on_quit;
+-gint grg_prefs_xpire;
+-gint grg_prefs_wipe_passes;
+-gint grg_prefs_mainwin_width, grg_prefs_mainwin_height;
++extern gboolean grg_prefs_warn4overwrite;
++extern gboolean grg_prefs_bak_files;
++extern gboolean grg_prefs_splash;
++extern gboolean grg_prefs_tray;
++extern gboolean grg_prefs_clip_clear_on_close;
++extern gboolean grg_prefs_clip_clear_on_quit;
++extern gint grg_prefs_xpire;
++extern gint grg_prefs_wipe_passes;
++extern gint grg_prefs_mainwin_width, grg_prefs_mainwin_height;
+
+ gchar *get_pref_file (void);
+ void set_pref_file (const gchar * newval);
Added: head/security/gringotts/files/patch-src_grg__recent__dox.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_grg__recent__dox.h Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,11 @@
+--- src/grg_recent_dox.h.orig 2008-01-04 13:08:43 UTC
++++ src/grg_recent_dox.h
+@@ -24,7 +24,7 @@
+
+ #define GRG_RECENT_LIMIT 6
+
+-GSList *grg_recent_dox;
++extern GSList *grg_recent_dox;
+
+ void grg_recent_dox_init (void);
+ void grg_recent_dox_deinit (void);
Added: head/security/gringotts/files/patch-src_grg__widgets.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_grg__widgets.h Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,11 @@
+--- src/grg_widgets.h.orig 2008-01-04 13:08:43 UTC
++++ src/grg_widgets.h
+@@ -25,7 +25,7 @@
+ #include "grg_defs.h"
+ #include <gtk/gtk.h>
+
+-gboolean mapIsUTF;
++extern gboolean mapIsUTF;
+
+ /* Shows and manages a dialog that asks for a string. */
+ gchar *grg_input_dialog (gchar * title, gchar * qtext, gchar * preset,
Added: head/security/gringotts/files/patch-src_gringotts.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/gringotts/files/patch-src_gringotts.h Sat Feb 27 21:37:38 2021 (r566736)
@@ -0,0 +1,16 @@
+--- src/gringotts.h.orig 2008-09-01 16:20:06 UTC
++++ src/gringotts.h
+@@ -24,10 +24,10 @@
+
+ #include "grg_defs.h"
+
+-GList *garbage;
++extern GList *garbage;
+
+-GRG_CTX gctx;
+-glong pwdbirth;
++extern GRG_CTX gctx;
++extern glong pwdbirth;
+
+ /*callbacks for menu items */
+
More information about the svn-ports-all
mailing list