rpms/gbdfed/devel gbdfed-1.4-gtk-deprecated-fix.patch, NONE, 1.1 gbdfed-1.4-patch1, NONE, 1.1 gbdfed.desktop, NONE, 1.1 gbdfed.spec, NONE, 1.1 gbdfed16x16.png, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Thu Dec 11 15:16:13 UTC 2008

Author: spot

Update of /cvs/pkgs/rpms/gbdfed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16498/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gbdfed-1.4-gtk-deprecated-fix.patch gbdfed-1.4-patch1 
	gbdfed.desktop gbdfed.spec gbdfed16x16.png import.log 
Log Message:

initial commit


gbdfed-1.4-gtk-deprecated-fix.patch:

--- NEW FILE gbdfed-1.4-gtk-deprecated-fix.patch ---
diff -up gbdfed-1.4/grayswatch.c.BAD gbdfed-1.4/grayswatch.c
--- gbdfed-1.4/grayswatch.c.BAD	2008-12-10 16:47:35.000000000 -0500
+++ gbdfed-1.4/grayswatch.c	2008-12-10 16:51:39.000000000 -0500
@@ -280,10 +280,10 @@ static const GTypeInfo grayswatch_info =
     grayswatch_init,
 };
 
-GtkType
+GType
 grayswatch_get_type(void)
 {
-    static GtkType grayswatch_type = 0;
+    static GType grayswatch_type = 0;
 
     if (!grayswatch_type)
       grayswatch_type = g_type_register_static(GTK_TYPE_VBOX,
diff -up gbdfed-1.4/grayswatch.h.BAD gbdfed-1.4/grayswatch.h
--- gbdfed-1.4/grayswatch.h.BAD	2008-12-10 16:49:24.000000000 -0500
+++ gbdfed-1.4/grayswatch.h	2008-12-10 16:50:46.000000000 -0500
@@ -29,14 +29,14 @@ G_BEGIN_DECLS
 /*
  * The macros for accessing various parts of the widget class.
  */
-#define GRAYSWATCH(obj)(GTK_CHECK_CAST(obj, grayswatch_get_type(), Grayswatch))
+#define GRAYSWATCH(obj)(G_TYPE_CHECK_INSTANCE_CAST(obj, grayswatch_get_type(), Grayswatch))
 #define GRAYSWATCH_CLASS(klass) \
-        (GTK_CHECK_CLASS_CAST(klass, grayswatch_get_type(), GrayswatchClass))
-#define IS_GRAYSWATCH(obj) GTK_CHECK_TYPE(obj, grayswatch_get_type())
+        (G_TYPE_CHECK_CLASS_CAST(klass, grayswatch_get_type(), GrayswatchClass))
+#define IS_GRAYSWATCH(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, grayswatch_get_type())
 #define IS_GRAYSWATCH_CLASS(klass) \
-        (GTK_CHECK_CLASS_TYPE(klass, grayswatch_get_type()))
+        (G_TYPE_CHECK_CLASS_TYPE(klass, grayswatch_get_type()))
 #define GRAYSWATCH_GET_CLASS(obj) \
-        (GTK_CHECK_GET_CLASS(obj, grayswatch_get_type(), GrayswatchClass))
+        (G_TYPE_INSTANCE_GET_CLASS(obj, grayswatch_get_type(), GrayswatchClass))
 
 typedef struct _Grayswatch      Grayswatch;
 typedef struct _GrayswatchClass GrayswatchClass;
@@ -82,7 +82,7 @@ struct _GrayswatchClass {
  *
  **************************************************************************/
 
-extern GtkType grayswatch_get_type(void);
+extern GType grayswatch_get_type(void);
 
 extern GtkWidget *grayswatch_new(guint gray);
 


--- NEW FILE gbdfed-1.4-patch1 ---
diff -r 00742899409c fontgrid.c
--- a/fontgrid.c	Thu Jun 12 10:15:04 2008 -0600
+++ b/fontgrid.c	Thu Jun 12 10:16:55 2008 -0600
@@ -4675,10 +4675,10 @@ fontgrid_update_psf_mappings(Fontgrid *f
 }
 
 gboolean
-fontgrid_select_next_glyph(Fontgrid *fw)
-{
-    bdf_glyph_t *gp;
-    gint32 code, pageno;
+fontgrid_select_next_glyph(Fontgrid *fw, gint32 code)
+{
+    bdf_glyph_t *gp;
+    gint32 pageno;
     guint32 count;
     FontgridInternalPageInfo *pi;
     FontgridSelectionInfo sinfo;
@@ -4695,8 +4695,6 @@ fontgrid_select_next_glyph(Fontgrid *fw)
         gp = (fw->font && fw->font->unencoded_used) ?
             (fw->font->unencoded + (fw->font->unencoded_used - 1)) : 0;
     }
-
-    code = pi->sel_start;
 
     if ((count = fw->count) == 0)
       count = 1;
@@ -4766,10 +4764,10 @@ fontgrid_select_next_glyph(Fontgrid *fw)
 }
 
 gboolean
-fontgrid_select_previous_glyph(Fontgrid *fw)
-{
-    bdf_glyph_t *gp;
-    gint32 code, pageno;
+fontgrid_select_previous_glyph(Fontgrid *fw, gint32 code)
+{
+    bdf_glyph_t *gp;
+    gint32 pageno;
     guint32 count;
     FontgridInternalPageInfo *pi;
     FontgridSelectionInfo sinfo;
@@ -4786,8 +4784,6 @@ fontgrid_select_previous_glyph(Fontgrid 
         gp = (fw->font && fw->font->unencoded_used) ?
             (fw->font->unencoded + (fw->font->unencoded_used - 1)) : 0;
     }
-
-    code = pi->sel_start;
 
     if ((count = fw->count) == 0)
       count = 1;
diff -r 00742899409c fontgrid.h
--- a/fontgrid.h	Thu Jun 12 10:15:04 2008 -0600
+++ b/fontgrid.h	Thu Jun 12 10:16:58 2008 -0600
@@ -308,8 +308,8 @@ extern void fontgrid_goto_next_page(Font
 extern void fontgrid_goto_next_page(Fontgrid *fw);
 extern void fontgrid_goto_previous_page(Fontgrid *fw);
 extern void fontgrid_get_page_info(Fontgrid *fw, FontgridPageInfo *pageinfo);
-extern gboolean fontgrid_select_next_glyph(Fontgrid *fw);
-extern gboolean fontgrid_select_previous_glyph(Fontgrid *fw);
+extern gboolean fontgrid_select_next_glyph(Fontgrid *fw, gint32 code);
+extern gboolean fontgrid_select_previous_glyph(Fontgrid *fw, gint32 code);
 
 /*
  * Font name functions.
diff -r 00742899409c guigedit.c
--- a/guigedit.c	Thu Jun 12 10:15:04 2008 -0600
+++ b/guigedit.c	Thu Jun 12 10:17:11 2008 -0600
@@ -480,7 +480,7 @@ next_glyph(GtkWidget *w, gpointer data)
 
     grid = glyphedit_get_grid(GLYPHEDIT(ge->gedit));
 
-    if (fontgrid_select_next_glyph(FONTGRID(ed->fgrid)) == FALSE)
+    if (fontgrid_select_next_glyph(FONTGRID(ed->fgrid), grid->encoding) == FALSE)
       return;
 
     font = fontgrid_get_font(FONTGRID(ed->fgrid));
@@ -514,7 +514,7 @@ previous_glyph(GtkWidget *w, gpointer da
 
     grid = glyphedit_get_grid(GLYPHEDIT(ge->gedit));
 
-    if (fontgrid_select_previous_glyph(FONTGRID(ed->fgrid)) == FALSE)
+    if (fontgrid_select_previous_glyph(FONTGRID(ed->fgrid), grid->encoding) == FALSE)
       return;
 
     font = fontgrid_get_font(FONTGRID(ed->fgrid));
diff -r fbbe77860e7e -r 00742899409c htext.h
--- a/htext.h	Thu May 01 13:23:21 2008 -0600
+++ b/htext.h	Thu Jun 12 10:15:04 2008 -0600
@@ -90,7 +90,7 @@ static gchar *fgrid_text = "<help>"
 "<center><b>Font Grid</b></center>\n"
 "\n"
 "The main window of each font editor is called the "
-"Font Grid. All of the Font Grid's have a special "
+"Font Grid. All of the Font Grids have a special "
 "clipboard used for passing glyphs around. This "
 "clipboard is called <b>FONTGRID_CLIPBOARD</b>.\n"
 "\n"
@@ -184,7 +184,7 @@ static gchar *fgrid_text = "<help>"
 "<margin3>During the export, an option menu will let you select whether you "
 "want to:</margin3>\n"
 "\n"
-"<margin3>A. Export the font with it's Unicode mappings.</margin3> "
+"<margin3>A. Export the font with its Unicode mappings.</margin3> "
 " "
 "<margin3>B. Export just the glyphs.</margin3>\n"
 "\n"
@@ -355,19 +355,14 @@ static gchar *fgrid_text = "<help>"
 "glyphs.</margin2>\n"
 "\n"
 "<margin2>To <bi>embolden</bi> means to make bold.</margin2> "
-" "
+"\n\n"
 "<b>Windows</b> "
-"<margin1>New <Ctrl+N></margin1>\n"
-"<margin2>This will cause a new editor to be created with "
-"the point size, resolution, and bits per pixel "
-"set from the config file, command line, or from "
-"the Setup dialog.</margin2>\n"
 "\n"
 "<margin1>[editor list]</margin1> "
 "<margin2>The remaining menu items are all the Font "
-"Grid's that have been created. Choosing one "
+"Grids that have been created. Choosing one "
 "will force that window to be made visible and "
-"also put that window on top.</margin2>\n"
+"moved to the top.</margin2>\n"
 "\n"
 "<bul>Font Grid Translations</bul>\n"
 "<margin>0..9</margin> "
@@ -895,8 +890,8 @@ static gchar *conf_text = "<help>"
 "<margin>close_accelerator_text <labelstring> [default: \"Ctrl+F4\"]</margin>\n"
 "\n"
 "<margin1>The default close accelerator text shown on the "
-"Close/Exit menu options of the FontGrid's and "
-"GlyphEditor's is \"Ctrl+F4\". This option changes the "
+"Close/Exit menu options of the FontGrids and "
+"GlyphEditors is \"Ctrl+F4\". This option changes the "
 "label string on those menu options. This option should "
 "be used in conjunction with the next option.</margin1>\n"
 "\n"
@@ -906,7 +901,7 @@ static gchar *conf_text = "<help>"
 "<margin>close_accelerator <translation> [default: \"<Control>F4\"]</margin>\n"
 "\n"
 "<margin1>The default accelerator for the Close/Exit menu options "
-"in the FontGrid's and GlyphEditor's can sometimes be "
+"in the FontGrids and GlyphEditors can sometimes be "
 "awkward for various reasons. This option allows that "
 "accelerator to be changed. This option should be used "
 "in conjunction with the previous option.</margin1>\n"
@@ -1292,7 +1287,7 @@ static gchar *preferences_text = "<help>
 "\n"
 "<margin1>The EOL menu sets the end-of-line string used "
 "when BDF fonts are saved. The three most common "
-"options are provided: Unix, DOS, and Mac EOL's.</margin1>\n"
+"options are provided: Unix, DOS, and Mac EOLs.</margin1>\n"
 "\n"
 "<margin>Point Size, Horizontal and Vertical Resolution</margin>\n"
 "\n"


--- NEW FILE gbdfed.desktop ---
[Desktop Entry]
Exec=gbdfed
Icon=gbdfed
Terminal=false
Name=gbdfed
GenericName=Bitmap Font Editor
Comment=Bitmap Font Editor
Type=Application
Categories=Graphics;
StartupNotify=true
X-Desktop-File-Install-Version=0.10


--- NEW FILE gbdfed.spec ---
Name:		gbdfed
Summary: 	Bitmap Font Editor
Version:	1.4
Release:	1%{?dist}
License:	MIT
Group:		Applications/System
Source0:	http://www.math.nmsu.edu/~mleisher/Software/gbdfed/%{name}-%{version}.tbz2
Source1:	http://www.math.nmsu.edu/~mleisher/Software/gbdfed/%{name}16x16.png
Source2:	gbdfed.desktop
Patch0:		http://www.math.nmsu.edu/~mleisher/Software/gbdfed/%{name}-1.4-patch1
# Fix the code to not use deprecated aliases
Patch1:		gbdfed-1.4-gtk-deprecated-fix.patch
URL:		http://www.math.nmsu.edu/~mleisher/Software/gbdfed/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	freetype-devel, pango-devel, libX11-devel, libICE-devel, gtk2-devel
BuildRequires:	desktop-file-utils

%description
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 paste operations between fonts and glyphs and 
editing font properties. The editor works natively with BDF fonts.

%prep
%setup -q 
%patch0 -p1 -b .patch1
%patch1 -p1 -b .gtk-deprecated-fix

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR="%{buildroot}" install
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -p -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/gbdfed.png
desktop-file-install					\
	--dir %{buildroot}%{_datadir}/applications	\
	%{SOURCE2}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc README
%{_bindir}/gbdfed
%{_datadir}/pixmaps/gbdfed.png
%{_datadir}/applications/*.desktop
%{_mandir}/man1/gbdfed*

%changelog
* Wed Dec 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.4-1
- initial Fedora package


--- NEW FILE import.log ---
gbdfed-1_4-1_fc11:HEAD:gbdfed-1.4-1.fc11.src.rpm:1229008313


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gbdfed/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Dec 2008 15:01:31 -0000	1.1
+++ .cvsignore	11 Dec 2008 15:15:43 -0000	1.2
@@ -0,0 +1 @@
+gbdfed-1.4.tbz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gbdfed/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Dec 2008 15:01:31 -0000	1.1
+++ sources	11 Dec 2008 15:15:43 -0000	1.2
@@ -0,0 +1 @@
+97dd44876f83caa5c3ae2c2479d7bff2  gbdfed-1.4.tbz2


