Compiling on RHEL 4 (GTK+ 2.4), patches

24 Jun 2006

Hi,
I noticed various issues when compiling on Red Hat Enterprise Linux 4:
1. Various source files use system functions printf(), sscanf(), mkdir() 
but did not include the appropriate header files and are therefore GCC 
fails complaining about the missing prototypes. One might want to add 
"#include <cstdio>" when using the first two functions, and refer "man 2 
mkdir" for the requirements of mkdir.
2. While configure specifies "gtk+-2.0 >= 2.4.0", there are a few 
changes that made Inkscape in fact requiring at least GTK+ 2.6, while 
the changes themselves would be easy to adapt to GTK+ 2.4.
3. One might argue whether this is Inkscape's fault, but similarly, 
Inkscape did not catch the annoyance of glib 2.4 headers contain macros 
that are colliding with libintl.h, in a graceful fashion. This can be 
solved to include libintl.h each time before glibmm/i18n.h (and extern 
"C" is needed because "#ifdef __cplusplus" is missing in libintl.h from 
older glibc headers).
I also made a (not really useful) patch that at least make --with-perl 
link properly.
Best,
Yue Shi Lai
diff -urNp inkscape-0.44/src/context-fns.cpp inkscape-0.44-RHEL4/src/context-fns.cpp

--- inkscape-0.44/src/context-fns.cpp	2006-06-23 04:07:29.000000000 +0000
+++ inkscape-0.44-RHEL4/src/context-fns.cpp	2006-06-23 18:35:31.000000000 +0000
@@ -1,3 +1,6 @@
+extern "C" {
+#include <libintl.h>
+}
 #include <glibmm/i18n.h>
 #include "sp-item.h"
 #include "desktop.h"
diff -urNp inkscape-0.44/src/extension/dependency.cpp inkscape-0.44-RHEL4/src/extension/dependency.cpp
--- inkscape-0.44/src/extension/dependency.cpp	2006-06-23 04:06:27.000000000 +0000
+++ inkscape-0.44-RHEL4/src/extension/dependency.cpp	2006-06-23 19:24:10.000000000 +0000
@@ -8,6 +8,9 @@
  */
+extern "C" {
+#include <libintl.h>
+}
 #include <glibmm/i18n.h>
#include "config.h"
diff -urNp inkscape-0.44/src/extension/error-file.cpp inkscape-0.44-RHEL4/src/extension/error-file.cpp
--- inkscape-0.44/src/extension/error-file.cpp	2006-06-23 04:06:27.000000000 +0000
+++ inkscape-0.44-RHEL4/src/extension/error-file.cpp	2006-06-23 19:26:44.000000000 +0000
@@ -9,6 +9,9 @@
// #include <glibmm/ustring.h>
+extern "C" {
+#include <libintl.h>
+}
 #include <glibmm/i18n.h>
diff -urNp inkscape-0.44/src/extension/script/InkscapeBinding.cpp inkscape-0.44-RHEL4/src/extension/script/InkscapeBinding.cpp
--- inkscape-0.44/src/extension/script/InkscapeBinding.cpp	2006-06-23 04:06:27.000000000 +0000
+++ inkscape-0.44-RHEL4/src/extension/script/InkscapeBinding.cpp	2006-06-23 19:29:35.000000000 +0000
@@ -1,5 +1,6 @@
+#include <cstdio>
 #include "InkscapeBinding.h"
#include "help.h"
diff -urNp inkscape-0.44/src/gradient-drag.cpp inkscape-0.44-RHEL4/src/gradient-drag.cpp
--- inkscape-0.44/src/gradient-drag.cpp	2006-06-23 04:07:29.000000000 +0000
+++ inkscape-0.44-RHEL4/src/gradient-drag.cpp	2006-06-23 18:47:25.000000000 +0000
@@ -11,6 +11,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+extern "C" {
+#include <libintl.h>
+}
 #include <glibmm/i18n.h>
#include "desktop-handles.h"
diff -urNp inkscape-0.44/src/io/sys.h inkscape-0.44-RHEL4/src/io/sys.h
--- inkscape-0.44/src/io/sys.h	2006-06-23 04:07:29.000000000 +0000
+++ inkscape-0.44-RHEL4/src/io/sys.h	2006-06-23 19:31:45.000000000 +0000
@@ -13,6 +13,8 @@
  */
#include <stdio.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <glib/gtypes.h>
 #include <glib/gdir.h>
 #include <glib/gfileutils.h>
diff -urNp inkscape-0.44/src/libnrtype/Layout-TNG-Input.cpp inkscape-0.44-RHEL4/src/libnrtype/Layout-TNG-Input.cpp
--- inkscape-0.44/src/libnrtype/Layout-TNG-Input.cpp	2006-06-23 04:06:37.000000000 +0000
+++ inkscape-0.44-RHEL4/src/libnrtype/Layout-TNG-Input.cpp	2006-06-24 06:24:22.000000000 +0000
@@ -229,7 +229,11 @@ static const Layout::EnumConversionItem 
     {SP_CSS_FONT_WEIGHT_200, PANGO_WEIGHT_ULTRALIGHT},
     {SP_CSS_FONT_WEIGHT_300, PANGO_WEIGHT_LIGHT},
     {SP_CSS_FONT_WEIGHT_400, PANGO_WEIGHT_NORMAL},
+#ifdef PANGO_WEIGHT_SEMIBOLD	// not available on pango before 1.8
     {SP_CSS_FONT_WEIGHT_500, PANGO_WEIGHT_SEMIBOLD},
+#else // PANGO_WEIGHT_SEMIBOLD
+    {SP_CSS_FONT_WEIGHT_500, PANGO_WEIGHT_NORMAL},
+#endif // PANGO_WEIGHT_SEMIBOLD
     {SP_CSS_FONT_WEIGHT_600, PANGO_WEIGHT_BOLD},
     {SP_CSS_FONT_WEIGHT_BOLD,PANGO_WEIGHT_BOLD},
     {SP_CSS_FONT_WEIGHT_700, PANGO_WEIGHT_BOLD},
diff -urNp inkscape-0.44/src/libnrtype/Layout-TNG-Output.cpp inkscape-0.44-RHEL4/src/libnrtype/Layout-TNG-Output.cpp
--- inkscape-0.44/src/libnrtype/Layout-TNG-Output.cpp	2006-06-23 04:06:37.000000000 +0000
+++ inkscape-0.44-RHEL4/src/libnrtype/Layout-TNG-Output.cpp	2006-06-24 06:24:34.000000000 +0000
@@ -219,7 +219,9 @@ static char const *weight_to_text(PangoW
     switch (w) {
         case PANGO_WEIGHT_ULTRALIGHT: return "ultralight";
         case PANGO_WEIGHT_LIGHT     : return "light";
+#ifdef PANGO_WEIGHT_SEMIBOLD    // not available on pango before 1.8
         case PANGO_WEIGHT_SEMIBOLD  : return "semibold";
+#endif // PANGO_WEIGHT_SEMIBOLD
         case PANGO_WEIGHT_NORMAL    : return "normalweight";
         case PANGO_WEIGHT_BOLD      : return "bold";
         case PANGO_WEIGHT_ULTRABOLD : return "ultrabold";
diff -urNp inkscape-0.44/src/sp-cursor.cpp inkscape-0.44-RHEL4/src/sp-cursor.cpp
--- inkscape-0.44/src/sp-cursor.cpp	2006-06-23 04:07:29.000000000 +0000
+++ inkscape-0.44-RHEL4/src/sp-cursor.cpp	2006-06-23 18:53:24.000000000 +0000
@@ -14,6 +14,7 @@
#include <string.h>
 #include <ctype.h>
+#include <cstdio>
 #include "sp-cursor.h"
void sp_cursor_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, gchar **xpm)
diff -urNp inkscape-0.44/src/trace/filterset.cpp inkscape-0.44-RHEL4/src/trace/filterset.cpp
--- inkscape-0.44/src/trace/filterset.cpp	2006-06-23 04:07:04.000000000 +0000
+++ inkscape-0.44-RHEL4/src/trace/filterset.cpp	2006-06-23 20:37:53.000000000 +0000
@@ -9,6 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+#include <cstdio>
 #include <stdlib.h>
#include "imagemap-gdk.h"
diff -urNp inkscape-0.44/src/ui/widget/ruler.cpp inkscape-0.44-RHEL4/src/ui/widget/ruler.cpp
--- inkscape-0.44/src/ui/widget/ruler.cpp	2006-06-23 04:07:07.000000000 +0000
+++ inkscape-0.44-RHEL4/src/ui/widget/ruler.cpp	2006-06-23 19:45:50.000000000 +0000
@@ -12,6 +12,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
+extern "C" {
+#include <libintl.h>
+}
 #include <glibmm/i18n.h>
#include <gtkmm/ruler.h>
diff -urNp inkscape-0.44/src/widgets/font-selector.cpp inkscape-0.44-RHEL4/src/widgets/font-selector.cpp
--- inkscape-0.44/src/widgets/font-selector.cpp	2006-06-23 04:06:19.000000000 +0000
+++ inkscape-0.44-RHEL4/src/widgets/font-selector.cpp	2006-06-24 06:26:49.000000000 +0000
@@ -307,7 +307,16 @@ static void sp_font_selector_style_selec
static void sp_font_selector_size_changed (GtkComboBox *cbox, SPFontSelector *fsel)
 {
+#if GTK_CHECK_VERSION(2,6,0)
     char *sstr = gtk_combo_box_get_active_text (GTK_COMBO_BOX (fsel->size));
+#else // GTK_CHECK_VERSION(2,6,0)
+    GtkTreeModel *model = gtk_combo_box_get_model (GTK_COMBO_BOX (fsel->size));
+    GtkTreeIter iter;
+    char *sstr = NULL;
+
+    if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (fsel->size), &iter) && model)
+        gtk_tree_model_get (model, &iter, 0, &sstr, -1);
+#endif // GTK_CHECK_VERSION(2,6,0)
     gfloat old_size = fsel->fontsize;
     fsel->fontsize = MAX(atof(sstr), 0.1);
     if ( fabs(fsel->fontsize-old_size) > 0.001)
diff -urNp inkscape-0.44/src/widgets/ruler.cpp inkscape-0.44-RHEL4/src/widgets/ruler.cpp
--- inkscape-0.44/src/widgets/ruler.cpp	2006-06-23 04:06:19.000000000 +0000
+++ inkscape-0.44-RHEL4/src/widgets/ruler.cpp	2006-06-23 20:09:42.000000000 +0000
@@ -14,6 +14,7 @@
  */
#include <cmath>
+#include <cstdio>
 #include <string.h>
 #include "widget-sizes.h"
 #include "ruler.h"
diff -urNp inkscape-0.44/src/widgets/toolbox.cpp inkscape-0.44-RHEL4/src/widgets/toolbox.cpp
--- inkscape-0.44/src/widgets/toolbox.cpp	2006-06-23 04:06:19.000000000 +0000
+++ inkscape-0.44-RHEL4/src/widgets/toolbox.cpp	2006-06-24 06:33:04.000000000 +0000
@@ -3252,7 +3252,16 @@ sp_text_toolbox_size_changed  (GtkComboB
if (g_object_get_data (tbl, "size-block")) return;
+#if GTK_CHECK_VERSION(2,6,0)
     char *text = gtk_combo_box_get_active_text (cbox);
+#else // GTK_CHECK_VERSION(2,6,0)
+    GtkTreeModel *model = gtk_combo_box_get_model (cbox);
+    GtkTreeIter iter;
+    char *text = NULL;
+
+    if (gtk_combo_box_get_active_iter (cbox, &iter) && model)
+        gtk_tree_model_get (model, &iter, 0, &text, -1);
+#endif // GTK_CHECK_VERSION(2,6,0)
SPCSSAttr *css = sp_repr_css_attr_new (); 
     sp_repr_css_set_property (css, "font-size", text); 
@@ -3406,7 +3415,9 @@ sp_text_toolbox_new (SPDesktop *desktop)
gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (Glib::unwrap(store)));
     gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
+#if GTK_CHECK_VERSION(2,6,0)
     gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (treeview), TRUE);
+#endif // GTK_CHECK_VERSION(2,6,0)
//gtk_tree_view_set_enable_search (GTK_TREE_VIEW (treeview), TRUE);
--- inkscape-0.44/src/Makefile.in	2006-06-23 04:14:56.000000000 +0000
+++ inkscape-0.44-RHEL4/src/Makefile.in	2006-06-24 06:31:32.000000000 +0000
@@ -578,7 +578,7 @@ all_libs = \
    $(FREETYPE_LIBS)	\
    $(kdeldadd)		\
    $(win32ldflags)		\
-	$(PERL_LIBS)		\
+	$(PERL_LDFLAGS)		\
    $(PYTHON_LIBS)	\
    $(LIBLOUDMOUTH_LIBS)

    

Yue Shi Lai

Ralf Stephan

tags (0)

participants (2)