cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work around a conflict with Gnome 2.

Browse Source
This commit is contained in:
marcm 2003-06-23 18:57:07 +00:00
parent 68acf6813f
commit 69732186df
3 changed files with 89 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11/gnome/libs/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.20 2003/01/02 03:32:25 marcm Exp $ # $OpenBSD: Makefile,v 1.21 2003/06/23 18:57:07 marcm Exp $
COMMENT= "libraries for the GNOME project" COMMENT= "libraries for the GNOME project"
@ -52,5 +52,12 @@ pre-build:
post-install: post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-libs; \ @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-libs; \
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-libs/ cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-libs/
# Fix conflict with Gnome 2
@mv ${PREFIX}/share/pixmaps/gnome-default-dlg.png ${PREFIX}/share/pixmaps/gnome-default-dlg1.png
@mv ${PREFIX}/share/pixmaps/gnome-error.png ${PREFIX}/share/pixmaps/gnome-error1.png
@mv ${PREFIX}/share/pixmaps/gnome-info.png ${PREFIX}/share/pixmaps/gnome-info1.png
@mv ${PREFIX}/share/pixmaps/gnome-question.png ${PREFIX}/share/pixmaps/gnome-question1.png
@mv ${PREFIX}/share/pixmaps/gnome-warning.png ${PREFIX}/share/pixmaps/gnome-warning1.png
.include <bsd.port.mk> .include <bsd.port.mk>

75
x11/gnome/libs/patches/patch-libgnomeui_gnome-messagebox_c Normal file
View File

@ -0,0 +1,75 @@
$OpenBSD: patch-libgnomeui_gnome-messagebox_c,v 1.1 2003/06/23 18:57:07 marcm Exp $
--- libgnomeui/gnome-messagebox.c.orig Sat Jun 21 20:00:40 2003
+++ libgnomeui/gnome-messagebox.c Sat Jun 21 20:02:33 2003
@@ -109,7 +109,7 @@ gnome_message_box_new (const gchar
if (strcmp(GNOME_MESSAGE_BOX_INFO, message_box_type) == 0)
{
gtk_window_set_title (GTK_WINDOW (message_box), _("Information"));
- s = gnome_unconditional_pixmap_file("gnome-info.png");
+ s = gnome_unconditional_pixmap_file("gnome-info1.png");
if (s) {
pixmap = gnome_pixmap_new_from_file(s);
g_free(s);
@@ -118,7 +118,7 @@ gnome_message_box_new (const gchar
else if (strcmp(GNOME_MESSAGE_BOX_WARNING, message_box_type) == 0)
{
gtk_window_set_title (GTK_WINDOW (message_box), _("Warning"));
- s = gnome_unconditional_pixmap_file("gnome-warning.png");
+ s = gnome_unconditional_pixmap_file("gnome-warning1.png");
if (s) {
pixmap = gnome_pixmap_new_from_file(s);
g_free(s);
@@ -127,7 +127,7 @@ gnome_message_box_new (const gchar
else if (strcmp(GNOME_MESSAGE_BOX_ERROR, message_box_type) == 0)
{
gtk_window_set_title (GTK_WINDOW (message_box), _("Error"));
- s = gnome_unconditional_pixmap_file("gnome-error.png");
+ s = gnome_unconditional_pixmap_file("gnome-error1.png");
if (s) {
pixmap = gnome_pixmap_new_from_file(s);
g_free(s);
@@ -136,7 +136,7 @@ gnome_message_box_new (const gchar
else if (strcmp(GNOME_MESSAGE_BOX_QUESTION, message_box_type) == 0)
{
gtk_window_set_title (GTK_WINDOW (message_box), _("Question"));
- s = gnome_unconditional_pixmap_file("gnome-question.png");
+ s = gnome_unconditional_pixmap_file("gnome-question1.png");
if (s) {
pixmap = gnome_pixmap_new_from_file(s);
g_free(s);
@@ -155,7 +155,7 @@ gnome_message_box_new (const gchar
if ( (pixmap == NULL) ||
(GNOME_PIXMAP(pixmap)->pixmap == NULL) ) {
if (pixmap) gtk_widget_destroy(pixmap);
- s = gnome_unconditional_pixmap_file ("gnome-default-dlg.png");
+ s = gnome_unconditional_pixmap_file ("gnome-default-dlg1.png");
if (s) {
pixmap = gnome_pixmap_new_from_file(s);
g_free(s);
@@ -242,7 +242,7 @@ gnome_message_box_newv (const gchar
if (strcmp(GNOME_MESSAGE_BOX_INFO, message_box_type) == 0)
{
gtk_window_set_title (GTK_WINDOW (message_box), _("Information"));
- s = gnome_pixmap_file("gnome-info.png");
+ s = gnome_pixmap_file("gnome-info1.png");
if (s) {
pixmap = gnome_pixmap_new_from_file(s);
g_free(s);
@@ -251,7 +251,7 @@ gnome_message_box_newv (const gchar
else if (strcmp(GNOME_MESSAGE_BOX_WARNING, message_box_type) == 0)
{
gtk_window_set_title (GTK_WINDOW (message_box), _("Warning"));
- s = gnome_pixmap_file("gnome-warning.png");
+ s = gnome_pixmap_file("gnome-warning1.png");
if (s) {
pixmap = gnome_pixmap_new_from_file(s);
g_free(s);
@@ -269,7 +269,7 @@ gnome_message_box_newv (const gchar
else if (strcmp(GNOME_MESSAGE_BOX_QUESTION, message_box_type) == 0)
{
gtk_window_set_title (GTK_WINDOW (message_box), _("Question"));
- s = gnome_pixmap_file("gnome-question.png");
+ s = gnome_pixmap_file("gnome-question1.png");
if (s) {
pixmap = gnome_pixmap_new_from_file(s);
g_free(s);

12
x11/gnome/libs/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2003/01/02 03:32:25 marcm Exp $ @comment $OpenBSD: PLIST,v 1.9 2003/06/23 18:57:07 marcm Exp $
@pkgcfl libgtop-* @pkgcfl libgtop-*
bin/dns-helper bin/dns-helper
bin/gconfigger bin/gconfigger
@ -549,11 +549,11 @@ share/locale/zh_CN/LC_MESSAGES/gnome-libs.mo
share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
share/mime-info/gnome.mime share/mime-info/gnome.mime
share/pixmaps/calculator-font.png share/pixmaps/calculator-font.png
share/pixmaps/gnome-default-dlg.png share/pixmaps/gnome-default-dlg1.png
share/pixmaps/gnome-error.png share/pixmaps/gnome-error1.png
share/pixmaps/gnome-info.png share/pixmaps/gnome-info1.png
share/pixmaps/gnome-question.png share/pixmaps/gnome-question1.png
share/pixmaps/gnome-warning.png share/pixmaps/gnome-warning1.png
share/pixmaps/no.xpm share/pixmaps/no.xpm
share/pixmaps/yes.xpm share/pixmaps/yes.xpm
share/type-convert/gnome-make-postscript-mimes share/type-convert/gnome-make-postscript-mimes