[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d84e965cef16dd9baf6a6d67fc3cdd28701feddb)

Vlad Glagolev scm at sourcemage.org
Thu Dec 20 00:56:57 EST 2007


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 graphics/gbdfed/DEPENDS           |    5 
 graphics/gbdfed/DETAILS           |    8 -
 graphics/gbdfed/HISTORY           |    5 
 graphics/gbdfed/PRE_BUILD         |   14 +-
 graphics/gbdfed/gbdfed-1.0-patch1 |   43 --------
 graphics/gbdfed/gbdfed-1.0-patch2 |   31 ------
 graphics/gbdfed/gbdfed-1.0-patch3 |  196 --------------------------------------
 graphics/gbdfed/gbdfed-1.0-patch4 |   63 ------------
 8 files changed, 19 insertions(+), 346 deletions(-)

New commits:
commit d84e965cef16dd9baf6a6d67fc3cdd28701feddb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gbdfed: => 1.3, cleaned up, fixed license

diff --git a/graphics/gbdfed/DEPENDS b/graphics/gbdfed/DEPENDS
index 983b774..061bab9 100755
--- a/graphics/gbdfed/DEPENDS
+++ b/graphics/gbdfed/DEPENDS
@@ -1,2 +1,3 @@
-depends  gtk+2  &&
-optional_depends  freetype2  ""  ""  "OpenType (OTF & TTF) support"
+depends gtk+2 &&
+
+optional_depends freetype2 "" "" "OpenType (OTF & TTF) support"
diff --git a/graphics/gbdfed/DETAILS b/graphics/gbdfed/DETAILS
index 033d76d..49208f7 100755
--- a/graphics/gbdfed/DETAILS
+++ b/graphics/gbdfed/DETAILS
@@ -1,13 +1,13 @@
            SPELL=gbdfed
-         VERSION=1.0
+         VERSION=1.3
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://crl.nmsu.edu/~mleisher/$SOURCE
-     SOURCE_HASH=sha512:60af99bf341e533a6b7ff7b46dc7b44b83b0a6e3938ecb6cd30589328ca1feb68e6226d76c9cd2b39e4cf20da68323443a65af0c90c5ec9f5f4afb21a2890285
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://crl.nmsu.edu/~mleisher/gbdfed.html
          ENTERED=20060531
-      LICENSE[0]=?
-           SHORT="gbdfed lets you interactively create new bitmap font files or modify existing ones."
+      LICENSE[0]=MIT
+           SHORT="GTK+2-based pixel (bitmap) font editor"
 cat << EOF
 gbdfed lets you interactively create new bitmap font files or modify existing
 ones. It allows editing multiple fonts and multiple glyphs, it allows cut and
diff --git a/graphics/gbdfed/HISTORY b/graphics/gbdfed/HISTORY
index 1ee51c8..671064c 100644
--- a/graphics/gbdfed/HISTORY
+++ b/graphics/gbdfed/HISTORY
@@ -1,3 +1,8 @@
+2007-12-20 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 1.3, cleaned up,
+	  corrected license, hash => gpg
+	* DEPENDS: cleaned up
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/graphics/gbdfed/PRE_BUILD b/graphics/gbdfed/PRE_BUILD
index eca4f72..368fb82 100755
--- a/graphics/gbdfed/PRE_BUILD
+++ b/graphics/gbdfed/PRE_BUILD
@@ -1,8 +1,8 @@
-default_pre_build     &&
-cd $SOURCE_DIRECTORY  &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
 
-# Apply author's bugfix patches released so far
-patch -p0 < $SCRIPT_DIRECTORY/gbdfed-1.0-patch1  &&
-patch -p0 < $SCRIPT_DIRECTORY/gbdfed-1.0-patch2  &&
-patch -p0 < $SCRIPT_DIRECTORY/gbdfed-1.0-patch3  &&
-patch -p0 < $SCRIPT_DIRECTORY/gbdfed-1.0-patch4
+# Apply author's bugfix patch released so far
+patch -p0 < $SCRIPT_DIRECTORY/gbdfed-1.3-patch1 &&
+
+# Apply our patch for new GTK+2
+patch -p0 < $SCRIPT_DIRECTORY/patch-Makefile_in
diff --git a/graphics/gbdfed/gbdfed-1.0-patch1 b/graphics/gbdfed/gbdfed-1.0-patch1
deleted file mode 100644
index 6218a56..0000000
--- a/graphics/gbdfed/gbdfed-1.0-patch1
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: gectrl.c
-===================================================================
---- gectrl.c	(revision 39)
-+++ gectrl.c	(working copy)
-@@ -848,7 +848,7 @@
- static void
- gecontrol_make_rgb_glyph(GEControl *ge)
- {
--    gint byte;
-+    gint byte = 0;
-     guint16 x, y, bpr, rgb_bpr, si, di, nx;
-     guchar bg[4], pix[4], *masks, *img;
-     bdf_bitmap_t *im;
-@@ -882,7 +882,7 @@
-      */
-     if (ge->rgb_size < ge->rgb_used) {
-         if (ge->rgb_size == 0)
--          ge->rgb = g_malloc(byte);
-+          ge->rgb = g_malloc(ge->rgb_used);
-         else
-           ge->rgb = g_realloc(ge->rgb, ge->rgb_used);
-         ge->rgb_size = ge->rgb_used;
-Index: gbdfed.c
-===================================================================
---- gbdfed.c	(revision 41)
-+++ gbdfed.c	(working copy)
-@@ -282,6 +282,7 @@
-      * Nothing seems to force the original window to the top of the stack
-      * on the screen, but this supposedly does everything necessary.
-      */
-+    gtk_widget_show_all(ed->shell);
-     gtk_window_present(GTK_WINDOW(ed->shell));
- }
- 
-@@ -2288,7 +2289,7 @@
- 
-     /*
-      * If a filename is not present on the command line, make sure an
--     * editor created after the command line is parsed.
-+     * editor is created after the command line is parsed.
-      */
-     need_editor = TRUE;
- 
diff --git a/graphics/gbdfed/gbdfed-1.0-patch2 b/graphics/gbdfed/gbdfed-1.0-patch2
deleted file mode 100644
index 6f5ec9d..0000000
--- a/graphics/gbdfed/gbdfed-1.0-patch2
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: glyphedit.c
-===================================================================
---- glyphedit.c	(revision 39)
-+++ glyphedit.c	(working copy)
-@@ -2084,11 +2084,11 @@
-     if (gw->op == GLYPHEDIT_DRAW) {
-         switch (event->button) {
-           case 1:
--            if ((changed = bdf_grid_set_pixel(gw->grid, x, y, gw->cidx-1)))
-+            if ((changed = bdf_grid_set_pixel(gw->grid, x, y, gw->cidx)))
-               glyphedit_draw_pixel(gw, x, y, FALSE);
-             break;
-           case 2:
--            if ((changed = bdf_grid_invert_pixel(gw->grid, x, y, gw->cidx-1)))
-+            if ((changed = bdf_grid_invert_pixel(gw->grid, x, y, gw->cidx)))
-               glyphedit_draw_pixel(gw, x, y, FALSE);
-             break;
-           case 3:
-@@ -2268,10 +2268,10 @@
-          * Drawing.
-          */
-         if (event->state & GDK_BUTTON1_MASK) {
--            if ((changed = bdf_grid_set_pixel(gw->grid, x, y, gw->cidx-1)))
-+            if ((changed = bdf_grid_set_pixel(gw->grid, x, y, gw->cidx)))
-               glyphedit_draw_pixel(gw, x, y, FALSE);
-         } else if (event->state & GDK_BUTTON2_MASK) {
--            if ((changed = bdf_grid_invert_pixel(gw->grid, x, y, gw->cidx-1)))
-+            if ((changed = bdf_grid_invert_pixel(gw->grid, x, y, gw->cidx)))
-               glyphedit_draw_pixel(gw, x, y, FALSE);
-         } else if (event->state & GDK_BUTTON3_MASK) {
-             if ((changed = bdf_grid_clear_pixel(gw->grid, x, y)))
diff --git a/graphics/gbdfed/gbdfed-1.0-patch3 b/graphics/gbdfed/gbdfed-1.0-patch3
deleted file mode 100644
index a6fa3c2..0000000
--- a/graphics/gbdfed/gbdfed-1.0-patch3
+++ /dev/null
@@ -1,196 +0,0 @@
---- htext.h	2006-01-16 21:04:04.000000000 -0700
-+++ /home/mleisher/src/gbdfed/htext.h	2006-04-26 21:12:25.000000000 -0600
-@@ -21,7 +21,7 @@
-  */
- 
- /*
-- * $Id: htext.h 39 2006-01-17 04:04:04Z mleisher $
-+ * $Id: htext.h 47 2006-04-27 03:12:32Z mleisher $
-  */
- static gchar *about_text = "\
-                  GBDFEditor 1.0\n\
-@@ -1205,7 +1205,7 @@
- static gchar *otf_text = "\
- If this program was compiled with the FreeType\n\
- library to support importing OpenType fonts\n\
--(.otf extension), TrueType fonts (.ttfextension), and\n\
-+(.otf extension), TrueType fonts (.ttf extension), and\n\
- TrueType collections (.ttc extension),\n\
- when importing a font or collection, a dialog\n\
- will be presented to allow you to choose a single font,\n\
---- README	2006-01-16 21:01:35.000000000 -0700
-+++ /home/mleisher/src/gbdfed/README	2006-04-26 21:12:39.000000000 -0600
-@@ -1,5 +1,5 @@
- #
--# $Id: README 38 2006-01-17 04:01:35Z mleisher $
-+# $Id: README 48 2006-04-27 03:12:45Z mleisher $
- #
- 
- gbdfed 1.0
-@@ -30,7 +30,7 @@
-   o  Imports Sun console fonts (vfont format).
-   o  Imports fonts from the X server.
-   o  Imports Windows FON/FNT fonts.
--  o  Imports TrueType fonts and collections.
-+  o  Imports OpenType/TrueType fonts and collections.
-   o  Exports PSF fonts.
-   o  Exports HEX fonts.
- 
-@@ -212,7 +212,12 @@
- 
-   James Cloos <cloos at jhcloos.com> for finding problems with gbdfed.
- 
-+  Ming Hua <minghua at rice.edu> for locating a problem with editing glyphs.
-+
-+  Sergio Martins <smartins at students.dei.uc.pt> for finding a typo and several
-+  dialog related bugs.
-+
- AUTHOR
- ------
-   Mark Leisher <mleisher at crl.nmsu.edu>
--  07 January 2006
-+  26 April 2006
---- guigedit.c	2006-01-17 10:07:28.000000000 -0700
-+++ /home/mleisher/src/gbdfed/guigedit.c	2006-04-26 21:14:54.000000000 -0600
-@@ -21,9 +21,9 @@
-  */
- #ifndef lint
- #ifdef __GNUC__
--static char svnid[] __attribute__ ((unused)) = "$Id: guigedit.c 40 2006-01-17 17:07:28Z mleisher $";
-+static char svnid[] __attribute__ ((unused)) = "$Id: guigedit.c 49 2006-04-27 03:14:37Z mleisher $";
- #else
--static char svnid[] = "$Id: guigedit.c 40 2006-01-17 17:07:28Z mleisher $";
-+static char svnid[] = "$Id: guigedit.c 49 2006-04-27 03:14:37Z mleisher $";
- #endif
- #endif
- 
-@@ -548,8 +548,8 @@
-     previous_glyph(w, data);
- }
- 
--static void
--close_glyph_editor(GtkWidget *w, gpointer data)
-+static gboolean
-+close_glyph_editor(GtkWidget *w, GdkEvent *ev, gpointer data)
- {
-     GlypheditRec *ge = glyph_editors + GPOINTER_TO_UINT(data);
- 
-@@ -559,7 +559,7 @@
-      * glyph editors.
-      */
-     if (ge->owner == ~0)
--      return;
-+      return TRUE;
- 
-     /*
-      * We don't check to see if the grid has been modified, because
-@@ -580,6 +580,14 @@
-      * Hide the shell.
-      */
-     gtk_widget_hide(ge->shell);
-+
-+    return TRUE;
-+}
-+
-+static void
-+activate_close_glyph_editor(GtkWidget *w, gpointer data)
-+{
-+    (void) close_glyph_editor(w, 0, data);
- }
- 
- static GtkWidget *
-@@ -619,9 +627,9 @@
-     gtk_menu_shell_append(GTK_MENU_SHELL(menu), sep);
- 
-     mitem = make_accel_menu_item(menu, "_Close", "<Control>F4", ge->ag);
--    g_signal_connect(G_OBJECT(mitem), "activate",
--                     G_CALLBACK(close_glyph_editor),
--                     GUINT_TO_POINTER(ge->id));
-+    (void) g_signal_connect(G_OBJECT(mitem), "activate",
-+                            G_CALLBACK(activate_close_glyph_editor),
-+                            GUINT_TO_POINTER(ge->id));
- 
-     gtk_menu_item_set_submenu(GTK_MENU_ITEM(file), menu);
- 
-@@ -1830,14 +1838,16 @@
- 
-     ge->shell = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- 
-+    gtk_window_set_title(GTK_WINDOW(ge->shell), buffer1);
-+
-     gtk_window_set_resizable(GTK_WINDOW(ge->shell), TRUE);
- 
--    (void) g_signal_connect(G_OBJECT(ge->shell), "destroy",
--                            G_CALLBACK(gtk_widget_hide), 0);
-+    (void) g_signal_connect(G_OBJECT(ge->shell), "destroy_event",
-+                            G_CALLBACK(close_glyph_editor),
-+                            GUINT_TO_POINTER(ge->id));
-     (void) g_signal_connect(G_OBJECT(ge->shell), "delete_event",
--                            G_CALLBACK(gtk_widget_hide), 0);
--
--    gtk_window_set_title(GTK_WINDOW(ge->shell), buffer1);
-+                            G_CALLBACK(close_glyph_editor),
-+                            GUINT_TO_POINTER(ge->id));
- 
-     vbox = gtk_vbox_new(FALSE, 0);
-     gtk_container_add(GTK_CONTAINER(ge->shell), vbox);
-@@ -2152,7 +2162,7 @@
-      */
-     for (i = 0; i < num_glyph_editors; i++) {
-         if (glyph_editors[i].id != ~0)
--          close_glyph_editor(0, GUINT_TO_POINTER(i));
-+          close_glyph_editor(0, 0, GUINT_TO_POINTER(i));
-     }
- 
-     /*
---- gbdfed.c	2006-05-01 08:33:09.000000000 -0600
-+++ /home/mleisher/src/gbdfed/gbdfed.c	2006-04-26 21:14:54.000000000 -0600
-@@ -21,9 +21,9 @@
-  */
- #ifndef lint
- #ifdef __GNUC__
--static char svnid[] __attribute__ ((unused)) = "$Id: gbdfed.c 41 2006-01-17 17:22:52Z mleisher $";
-+static char svnid[] __attribute__ ((unused)) = "$Id: gbdfed.c 49 2006-04-27 03:14:37Z mleisher $";
- #else
--static char svnid[] = "$Id: gbdfed.c 41 2006-01-17 17:22:52Z mleisher $";
-+static char svnid[] = "$Id: gbdfed.c 49 2006-04-27 03:14:37Z mleisher $";
- #endif
- #endif
- 
-@@ -209,8 +209,8 @@
-  *
-  **************************************************************************/
- 
--static void
--quit_application(GtkWidget *w, gpointer data)
-+static gboolean
-+quit_application(GtkWidget *w, GdkEvent *ev, gpointer data)
- {
-     guint i, modified;
- 
-@@ -258,7 +258,7 @@
-      */
-     if (options.really_exit &&
-         !guiutil_yes_or_no(editors[0].shell, "Really Quit?", TRUE))
--      return;
-+      return TRUE;
- 
-     /*
-      * Call all the cleanup routines in case something really needs to be
-@@ -1666,14 +1666,14 @@
-     gtk_window_set_resizable(GTK_WINDOW(ed->shell), TRUE);
- 
-     if (ed->id == 0) {
--        (void) g_signal_connect(G_OBJECT(ed->shell), "destroy",
-+        (void) g_signal_connect(G_OBJECT(ed->shell), "destroy_event",
-                                 G_CALLBACK(quit_application),
-                                 GUINT_TO_POINTER(ed->id));
-         (void) g_signal_connect(G_OBJECT(ed->shell), "delete_event",
-                                 G_CALLBACK(quit_application),
-                                 GUINT_TO_POINTER(ed->id));
-     } else {
--        (void) g_signal_connect(G_OBJECT(ed->shell), "destroy",
-+        (void) g_signal_connect(G_OBJECT(ed->shell), "destroy_event",
-                                 G_CALLBACK(gtk_widget_hide), 0);
-         (void) g_signal_connect(G_OBJECT(ed->shell), "delete_event",
-                                 G_CALLBACK(gtk_widget_hide), 0);
diff --git a/graphics/gbdfed/gbdfed-1.0-patch4 b/graphics/gbdfed/gbdfed-1.0-patch4
deleted file mode 100644
index 274615e..0000000
--- a/graphics/gbdfed/gbdfed-1.0-patch4
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: README
-===================================================================
---- README	(revision 49)
-+++ README	(working copy)
-@@ -217,7 +217,10 @@
-   Sergio Martins <smartins at students.dei.uc.pt> for finding a typo and several
-   dialog related bugs.
- 
-+  Viktor Urban <viktor at icc-atcsolutions.com> for locating a problem when
-+  saving and moving to the next or previous glyph.
-+
- AUTHOR
- ------
-   Mark Leisher <mleisher at crl.nmsu.edu>
--  26 April 2006
-+  17 May 2006
-Index: glyphedit.c
-===================================================================
---- glyphedit.c	(revision 49)
-+++ glyphedit.c	(working copy)
-@@ -1108,10 +1108,12 @@
-       gw->last_x = gw->last_y = 0;
- 
-     /*
--     * Switch back to draw mode with a new glyph.
-+     * If the widget is in Move or Copy mode, change back to Select mode.
-      */
--    gw->pending_op = gw->op;
--    gw->op = GLYPHEDIT_DRAW;
-+    if (gw->op == GLYPHEDIT_MOVE || gw->op == GLYPHEDIT_COPY) {
-+        gw->pending_op = gw->op;
-+        gw->op = GLYPHEDIT_SELECT;
-+    }
- 
-     gw->cidx = 1;
-     gw->lcolor = 0;
-Index: guigedit.c
-===================================================================
---- guigedit.c	(revision 49)
-+++ guigedit.c	(working copy)
-@@ -348,14 +348,19 @@
-     gchar *prgname = g_get_prgname();
-     gboolean unencoded;
-     bdf_glyph_t *glyph;
-+    GlypheditOperation op;
- 
-     if (GTK_WIDGET_IS_SENSITIVE(ge->update) == TRUE) {
--        if (glyphedit_get_selecting(GLYPHEDIT(ge->gedit)) == TRUE)
-+        if (glyphedit_get_selecting(GLYPHEDIT(ge->gedit)) == TRUE) {
-           /*
-            * A selection operation is in progress. Need to switch back to
--           * the Draw operation to finalize the selection.
-+           * the Draw operation to finalize the selection and then switch
-+           * back.
-            */
--          glyphedit_change_operation(GLYPHEDIT(ge->gedit), GLYPHEDIT_DRAW);
-+            op = glyphedit_get_operation(GLYPHEDIT(ge->gedit));
-+            glyphedit_change_operation(GLYPHEDIT(ge->gedit), GLYPHEDIT_DRAW);
-+            glyphedit_change_operation(GLYPHEDIT(ge->gedit), op);
-+        }
- 
-         glyph = glyphedit_get_glyph(GLYPHEDIT(ge->gedit), &unencoded);
- 



More information about the SM-Commit mailing list