summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2004-05-31 01:45:33 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2004-05-31 01:45:33 +0000
commit351741bdcd567f87f086f72a39ed64ec91d03d38 (patch)
tree0b66b451381afe2490738c33d8f959b5adcb6231
parentIGNORE: Uses an unregistered uid/gid. (diff)
Unbreak on 4.x and get rid of USE_GCC.
Notes
Notes: svn path=/head/; revision=110441
-rw-r--r--x11-themes/gtk-qt-engine/Makefile1
-rw-r--r--x11-themes/gtk-qt-engine/files/patch-qt_theme_draw.c87
-rw-r--r--x11-themes/gtk-qt4-engine/Makefile1
-rw-r--r--x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c87
-rw-r--r--x11-toolkits/gtk-qt-engine/Makefile1
-rw-r--r--x11-toolkits/gtk-qt-engine/files/patch-qt_theme_draw.c87
6 files changed, 234 insertions, 30 deletions
diff --git a/x11-themes/gtk-qt-engine/Makefile b/x11-themes/gtk-qt-engine/Makefile
index 990a921af5c4..20d87725248c 100644
--- a/x11-themes/gtk-qt-engine/Makefile
+++ b/x11-themes/gtk-qt-engine/Makefile
@@ -20,7 +20,6 @@ USE_LIBTOOL_VER= 13
WANT_GNOME= no
USE_GNOME= gnomehack gtk20
USE_QT_VER= 3
-USE_GCC= 3.3
USE_REINPLACE= yes
PLIST_SUB= GTK_VER=2.4.0
diff --git a/x11-themes/gtk-qt-engine/files/patch-qt_theme_draw.c b/x11-themes/gtk-qt-engine/files/patch-qt_theme_draw.c
index 665215cd1b4f..a0d3b600d86b 100644
--- a/x11-themes/gtk-qt-engine/files/patch-qt_theme_draw.c
+++ b/x11-themes/gtk-qt-engine/files/patch-qt_theme_draw.c
@@ -1,9 +1,78 @@
---- qt_theme_draw.c.orig Mon Feb 9 19:50:12 2004
-+++ qt_theme_draw.c Tue Mar 30 02:09:08 2004
-@@ -1,5 +1,6 @@
- #include <math.h>
- #include <string.h>
-+#include <gdk/gdk.h>
- #include <gtk/gtkprogressbar.h>
- #include <gtk/gtkrange.h>
- #include <gtk/gtknotebook.h>
+--- qt_theme_draw.c.orig Mon May 31 01:16:28 2004
++++ qt_theme_draw.c Mon May 31 03:19:50 2004
+@@ -257,6 +256,9 @@
+ gint height)
+ {
+
++GdkGC *gc1 = NULL;
++GdkGC *gc2 = NULL;
++
+ if (!widget) return;
+
+ sanitize_size(window, &width, &height);
+@@ -300,8 +302,6 @@
+ }
+
+ return;
+- GdkGC *gc1 = NULL;
+- GdkGC *gc2 = NULL;
+
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+@@ -687,9 +687,6 @@
+ GtkArrowType arrow_type,
+ gint fill, gint x, gint y, gint width, gint height)
+ {
+- if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
+- return;
+- /*printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+ GdkGC *gc1;
+ GdkGC *gc2;
+ GdkGC *gc3;
+@@ -698,6 +695,10 @@
+ gint half_height;
+ gint ax, ay, aw, ah;
+
++ if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
++ return;
++ /*printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
++
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+
+@@ -1095,7 +1096,10 @@
+ gint y,
+ gint width,
+ gint height)
+-{
++{
++ GdkGC *light_gc, *dark_gc;
++ GtkOrientation orientation;
++
+ sanitize_size(window, &width, &height);
+ /*printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+ if (WIDGET("GtkHScrollbar") || WIDGET("GtkVScrollbar"))
+@@ -1136,9 +1140,6 @@
+
+ /*printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+
+- GdkGC *light_gc, *dark_gc;
+- GtkOrientation orientation;
+-
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+
+@@ -1716,12 +1717,12 @@
+ gint height,
+ GtkOrientation orientation)
+ {
+- return;
+ GdkPoint pointsh[7];
+ GdkRegion *clipreg;
+ GdkRectangle rec;
+ int i, rect = FALSE, midlines = MARKS_SLASH;
+ int modx, mody;
++ return;
+
+
+ g_return_if_fail(style != NULL);
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 990a921af5c4..20d87725248c 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -20,7 +20,6 @@ USE_LIBTOOL_VER= 13
WANT_GNOME= no
USE_GNOME= gnomehack gtk20
USE_QT_VER= 3
-USE_GCC= 3.3
USE_REINPLACE= yes
PLIST_SUB= GTK_VER=2.4.0
diff --git a/x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c b/x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c
index 665215cd1b4f..a0d3b600d86b 100644
--- a/x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c
+++ b/x11-themes/gtk-qt4-engine/files/patch-qt_theme_draw.c
@@ -1,9 +1,78 @@
---- qt_theme_draw.c.orig Mon Feb 9 19:50:12 2004
-+++ qt_theme_draw.c Tue Mar 30 02:09:08 2004
-@@ -1,5 +1,6 @@
- #include <math.h>
- #include <string.h>
-+#include <gdk/gdk.h>
- #include <gtk/gtkprogressbar.h>
- #include <gtk/gtkrange.h>
- #include <gtk/gtknotebook.h>
+--- qt_theme_draw.c.orig Mon May 31 01:16:28 2004
++++ qt_theme_draw.c Mon May 31 03:19:50 2004
+@@ -257,6 +256,9 @@
+ gint height)
+ {
+
++GdkGC *gc1 = NULL;
++GdkGC *gc2 = NULL;
++
+ if (!widget) return;
+
+ sanitize_size(window, &width, &height);
+@@ -300,8 +302,6 @@
+ }
+
+ return;
+- GdkGC *gc1 = NULL;
+- GdkGC *gc2 = NULL;
+
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+@@ -687,9 +687,6 @@
+ GtkArrowType arrow_type,
+ gint fill, gint x, gint y, gint width, gint height)
+ {
+- if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
+- return;
+- /*printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+ GdkGC *gc1;
+ GdkGC *gc2;
+ GdkGC *gc3;
+@@ -698,6 +695,10 @@
+ gint half_height;
+ gint ax, ay, aw, ah;
+
++ if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
++ return;
++ /*printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
++
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+
+@@ -1095,7 +1096,10 @@
+ gint y,
+ gint width,
+ gint height)
+-{
++{
++ GdkGC *light_gc, *dark_gc;
++ GtkOrientation orientation;
++
+ sanitize_size(window, &width, &height);
+ /*printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+ if (WIDGET("GtkHScrollbar") || WIDGET("GtkVScrollbar"))
+@@ -1136,9 +1140,6 @@
+
+ /*printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+
+- GdkGC *light_gc, *dark_gc;
+- GtkOrientation orientation;
+-
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+
+@@ -1716,12 +1717,12 @@
+ gint height,
+ GtkOrientation orientation)
+ {
+- return;
+ GdkPoint pointsh[7];
+ GdkRegion *clipreg;
+ GdkRectangle rec;
+ int i, rect = FALSE, midlines = MARKS_SLASH;
+ int modx, mody;
++ return;
+
+
+ g_return_if_fail(style != NULL);
diff --git a/x11-toolkits/gtk-qt-engine/Makefile b/x11-toolkits/gtk-qt-engine/Makefile
index 990a921af5c4..20d87725248c 100644
--- a/x11-toolkits/gtk-qt-engine/Makefile
+++ b/x11-toolkits/gtk-qt-engine/Makefile
@@ -20,7 +20,6 @@ USE_LIBTOOL_VER= 13
WANT_GNOME= no
USE_GNOME= gnomehack gtk20
USE_QT_VER= 3
-USE_GCC= 3.3
USE_REINPLACE= yes
PLIST_SUB= GTK_VER=2.4.0
diff --git a/x11-toolkits/gtk-qt-engine/files/patch-qt_theme_draw.c b/x11-toolkits/gtk-qt-engine/files/patch-qt_theme_draw.c
index 665215cd1b4f..a0d3b600d86b 100644
--- a/x11-toolkits/gtk-qt-engine/files/patch-qt_theme_draw.c
+++ b/x11-toolkits/gtk-qt-engine/files/patch-qt_theme_draw.c
@@ -1,9 +1,78 @@
---- qt_theme_draw.c.orig Mon Feb 9 19:50:12 2004
-+++ qt_theme_draw.c Tue Mar 30 02:09:08 2004
-@@ -1,5 +1,6 @@
- #include <math.h>
- #include <string.h>
-+#include <gdk/gdk.h>
- #include <gtk/gtkprogressbar.h>
- #include <gtk/gtkrange.h>
- #include <gtk/gtknotebook.h>
+--- qt_theme_draw.c.orig Mon May 31 01:16:28 2004
++++ qt_theme_draw.c Mon May 31 03:19:50 2004
+@@ -257,6 +256,9 @@
+ gint height)
+ {
+
++GdkGC *gc1 = NULL;
++GdkGC *gc2 = NULL;
++
+ if (!widget) return;
+
+ sanitize_size(window, &width, &height);
+@@ -300,8 +302,6 @@
+ }
+
+ return;
+- GdkGC *gc1 = NULL;
+- GdkGC *gc2 = NULL;
+
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+@@ -687,9 +687,6 @@
+ GtkArrowType arrow_type,
+ gint fill, gint x, gint y, gint width, gint height)
+ {
+- if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
+- return;
+- /*printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+ GdkGC *gc1;
+ GdkGC *gc2;
+ GdkGC *gc3;
+@@ -698,6 +695,10 @@
+ gint half_height;
+ gint ax, ay, aw, ah;
+
++ if (DETAIL("hscrollbar") || DETAIL("vscrollbar"))
++ return;
++ /*printf("Arrow (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
++
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+
+@@ -1095,7 +1096,10 @@
+ gint y,
+ gint width,
+ gint height)
+-{
++{
++ GdkGC *light_gc, *dark_gc;
++ GtkOrientation orientation;
++
+ sanitize_size(window, &width, &height);
+ /*printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+ if (WIDGET("GtkHScrollbar") || WIDGET("GtkVScrollbar"))
+@@ -1136,9 +1140,6 @@
+
+ /*printf("Box (%d,%d,%d,%d) Widget: %s Detail: %s\n",x,y,width,height,gtk_widget_get_name(widget),detail);*/
+
+- GdkGC *light_gc, *dark_gc;
+- GtkOrientation orientation;
+-
+ g_return_if_fail(style != NULL);
+ g_return_if_fail(window != NULL);
+
+@@ -1716,12 +1717,12 @@
+ gint height,
+ GtkOrientation orientation)
+ {
+- return;
+ GdkPoint pointsh[7];
+ GdkRegion *clipreg;
+ GdkRectangle rec;
+ int i, rect = FALSE, midlines = MARKS_SLASH;
+ int modx, mody;
++ return;
+
+
+ g_return_if_fail(style != NULL);