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

Update to gentoo-0.19.13.

Browse Source 
based on a diff from Gonzalo L. R.
This commit is contained in:
ajacoutot 2012-03-19 12:59:41 +00:00
parent 3ff389c550
commit 005a97ad38
8 changed files with 33 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/gentoo/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2011/09/16 12:29:13 espie Exp $
# $OpenBSD: Makefile,v 1.23 2012/03/19 12:59:41 ajacoutot Exp $
COMMENT= GTK+-2 Graphical filemanager
COMMENT= GTK+2 graphical filemanager
DISTNAME= gentoo-0.15.6
REVISION= 4
DISTNAME= gentoo-0.19.13
CATEGORIES= x11
@ -17,12 +16,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0 gdk-x11-2.0 gtk-x11-2.0
WANTLIB += GL Xxf86vm drm gthread-2.0 pthread xcb-render xcb-shm
WANTLIB += GL gthread-2.0 pthread xcb-render xcb-shm
MODULES= devel/gettext
@ -31,6 +30,9 @@ LIB_DEPENDS= x11/gtk+2
CONFIGURE_STYLE= gnu
NO_REGRESS= Yes
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/buttons.c
pre-install:
@chmod +x ${WRKSRC}/install-sh

10
x11/gentoo/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gentoo-0.15.6.tar.gz) = 3cg3Ley1W/+7QeEXEXX+fQ==
RMD160 (gentoo-0.15.6.tar.gz) = i68duJJiEdwoOUhM3OSDk7K6y8Y=
SHA1 (gentoo-0.15.6.tar.gz) = neDAmqA7q+7nFNzJmxpZQDVCY3k=
SHA256 (gentoo-0.15.6.tar.gz) = wxCL17zW3A8ZwPMNq09s4PNtLQIASImcdNVmev5DnZ0=
SIZE (gentoo-0.15.6.tar.gz) = 1467732
MD5 (gentoo-0.19.13.tar.gz) = WHYZRauTj79WOlowIj/igQ==
RMD160 (gentoo-0.19.13.tar.gz) = c8vtx8NCmf2HwW9yhu9Gvfw4VBc=
SHA1 (gentoo-0.19.13.tar.gz) = f1pRS7RGp7FIaCVNrS5PEh/IY54=
SHA256 (gentoo-0.19.13.tar.gz) = avr+rNVKGNl+IXrRDfG1VSdKyFbwUOEIiBCdQF69wJI=
SIZE (gentoo-0.19.13.tar.gz) = 1541738

10
x11/gentoo/patches/patch-Makefile_in
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.2 2010/03/21 09:13:53 jasper Exp $
--- Makefile.in.orig Tue Jun 23 22:58:39 2009
+++ Makefile.in Fri Jan 29 19:07:07 2010
@@ -674,7 +674,7 @@ install-data-am:
$OpenBSD: patch-Makefile_in,v 1.3 2012/03/19 12:59:42 ajacoutot Exp $
--- Makefile.in.orig Sat Aug 27 06:51:13 2011
+++ Makefile.in Mon Mar 12 15:06:18 2012
@@ -765,7 +765,7 @@ install-dvi: install-dvi-recursive
install-dvi: install-dvi-recursive
install-dvi-am:
-install-exec-am: install-sysconfDATA
+install-exec-am:

14
x11/gentoo/patches/patch-gentoorc_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gentoorc_in,v 1.3 2010/03/21 09:13:53 jasper Exp $
--- gentoorc.in.orig Fri Jan 29 19:04:29 2010
+++ gentoorc.in Fri Jan 29 19:05:02 2010
@@ -697,8 +697,8 @@
</Paths>
<Mounting>
<mode>"never"</mode>
- <cmd_mount>"/bin/mount"</cmd_mount>
- <cmd_umount>"/bin/umount"</cmd_umount>
+ <cmd_mount>"/sbin/mount"</cmd_mount>
+ <cmd_umount>"/sbin/umount"</cmd_umount>
<check_nlink>TRUE</check_nlink>
<show_stderr>TRUE</show_stderr>
<umount_exit>TRUE</umount_exit>

12
x11/gentoo/patches/patch-src_buttons_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_buttons_c,v 1.1 2012/03/19 12:59:42 ajacoutot Exp $
--- src/buttons.c.orig Mon Mar 12 15:03:30 2012
+++ src/buttons.c Mon Mar 12 15:04:24 2012
@@ -1001,7 +1001,7 @@ static ButtonSheet * btn_buttonsheet_new_default_short
ButtonSheet *bsh;
ButtonRow *brw;
const gchar *lab[] = { "Home", "Local", "/", "CD-ROM" },
- *pth[] = { "$HOME", "/usr/local/", "/", "/cdrom/" };
+ *pth[] = { "$HOME", "${LOCALBASE}", "/", "/cdrom/" };
gchar buf[1024];
guint i;

87
x11/gentoo/patches/patch-src_cmdgrab_c
View File

@ -1,87 +0,0 @@
$OpenBSD: patch-src_cmdgrab_c,v 1.1 2010/03/21 09:13:53 jasper Exp $
Rename struct fields, as they clashed with stdout and stderr definitions in stdio.h.
--- src/cmdgrab.c.orig Tue Feb 23 12:49:04 2010
+++ src/cmdgrab.c Tue Feb 23 12:50:33 2010
@@ -31,7 +31,7 @@
typedef struct {
MainInfo *min;
pid_t child;
- GIOChannel *stdout, *stderr; /* Channels for stdout and stderr from child. */
+ GIOChannel *stdout_g, *stderr_g; /* Channels for stdout and stderr from child. */
gint fd_out, fd_err; /* File descriptors for output & error channels. */
gint tag_out, tag_err; /* GTK+ input tags for those channels. */
gint evt_del; /* Delete event handler. */
@@ -149,7 +149,7 @@ static gboolean grab_callback(GIOChannel *channel, GIO
if(gri->txv != NULL)
{
txv_show(gri->txv);
- if(channel == gri->stdout)
+ if(channel == gri->stdout_g)
txv_text_append(gri->txv, line, linelen);
else
txv_text_append_with_color(gri->txv, line, linelen, &gri->stderr_color);
@@ -160,25 +160,25 @@ static gboolean grab_callback(GIOChannel *channel, GIO
}
if((cond & G_IO_ERR) || (cond & G_IO_HUP))
{
- if(channel == gri->stdout)
+ if(channel == gri->stdout_g)
{
g_source_remove(gri->tag_out);
- g_io_channel_shutdown(gri->stdout, FALSE, NULL);
- g_io_channel_unref(gri->stdout);
- gri->stdout = NULL;
+ g_io_channel_shutdown(gri->stdout_g, FALSE, NULL);
+ g_io_channel_unref(gri->stdout_g);
+ gri->stdout_g = NULL;
close(gri->fd_out);
gri->fd_out = 0;
}
- else if(channel == gri->stderr)
+ else if(channel == gri->stderr_g)
{
g_source_remove(gri->tag_err);
- g_io_channel_shutdown(gri->stderr, FALSE, NULL);
- g_io_channel_unref(gri->stderr);
- gri->stderr = NULL;
+ g_io_channel_shutdown(gri->stderr_g, FALSE, NULL);
+ g_io_channel_unref(gri->stderr_g);
+ gri->stderr_g = NULL;
close(gri->fd_err);
gri->fd_err = 0;
}
- if(gri->stdout == NULL && gri->stderr == NULL)
+ if(gri->stdout_g == NULL && gri->stderr_g == NULL)
{
if(gri->txv != NULL) /* Window still open? */
{
@@ -210,12 +210,12 @@ static gboolean grab_output(MainInfo *min, const gchar
gri->stderr_color.red = 0xfefeu;
gri->stderr_color.green = 0x1e1eu;
gri->stderr_color.blue = 0x1e1eu;
- if((gri->stdout = g_io_channel_unix_new(fd_out)) != NULL)
+ if((gri->stdout_g = g_io_channel_unix_new(fd_out)) != NULL)
{
- /*g_io_channel_set_buffered(gri->stdout, FALSE);*/
- g_io_channel_set_buffer_size(gri->stdout, GRAB_CHUNK);
+ /*g_io_channel_set_buffered(gri->stdout_g, FALSE);*/
+ g_io_channel_set_buffer_size(gri->stdout_g, GRAB_CHUNK);
gri->fd_err = fd_err;
- if((gri->stderr = g_io_channel_unix_new(fd_err)) != NULL)
+ if((gri->stderr_g = g_io_channel_unix_new(fd_err)) != NULL)
{
if((gri->txv = txv_open(min, NULL)) != NULL)
{
@@ -224,8 +224,8 @@ static gboolean grab_output(MainInfo *min, const gchar
gtk_object_set_data(GTK_OBJECT(gri->txv), "gri", gri);
gri->evt_del = g_signal_connect(G_OBJECT(gri->txv), "delete_event", G_CALLBACK(evt_grab_deleted), gri);
txv_connect_keypress(gri->txv, GTK_SIGNAL_FUNC(evt_grab_keypress), gri);
- gri->tag_out = g_io_add_watch(gri->stdout, G_IO_IN | G_IO_PRI | G_IO_HUP, grab_callback, gri);
- gri->tag_err = g_io_add_watch(gri->stderr, G_IO_IN | G_IO_PRI | G_IO_HUP, grab_callback, gri);
+ gri->tag_out = g_io_add_watch(gri->stdout_g, G_IO_IN | G_IO_PRI | G_IO_HUP, grab_callback, gri);
+ gri->tag_err = g_io_add_watch(gri->stderr_g, G_IO_IN | G_IO_PRI | G_IO_HUP, grab_callback, gri);
return TRUE;
}

67
x11/gentoo/patches/patch-src_odmultibutton_c
View File

@ -1,67 +0,0 @@
$OpenBSD: patch-src_odmultibutton_c,v 1.2 2010/09/30 07:23:47 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
odmultibutton.c:324: error: implicit declaration of function 'GTK_OBJECT_FLAGS'
--- src/odmultibutton.c.orig Tue Jun 23 22:57:22 2009
+++ src/odmultibutton.c Thu Sep 30 07:33:44 2010
@@ -5,9 +5,6 @@
#include <stdio.h>
#include <stdlib.h>
-/* ODMultiButton is 2.x pure, like freshly fallen snow. */
-#define GTK_DISABLE_DEPRECATED
-
#include <gtk/gtk.h>
#include "odmultibutton.h"
@@ -73,8 +70,8 @@ static void od_multibutton_set_page(GtkWidget *widget,
}
if(p != NULL)
{
- if(GTK_WIDGET_STATE(widget) != GTK_WIDGET_STATE(p))
- gtk_widget_set_state(p, GTK_WIDGET_STATE(widget));
+ if(gtk_widget_get_state(widget) != gtk_widget_get_state(p))
+ gtk_widget_set_state(p, gtk_widget_get_state(widget));
gtk_widget_show(p);
if(gtk_widget_get_parent(p) != NULL)
gtk_widget_reparent(p, widget);
@@ -86,7 +83,7 @@ static void od_multibutton_set_page(GtkWidget *widget,
}
mb->last_index = index;
}
- if(GTK_WIDGET_DRAWABLE(widget))
+ if(gtk_widget_is_drawable(widget))
gtk_widget_queue_draw(widget);
}
@@ -144,9 +141,9 @@ static void od_multibutton_paint_dog_ear(GtkWidget *wi
{
GtkStateType state;
- state = GTK_WIDGET_STATE(widget);
+ state = gtk_widget_get_state(widget);
- if(GTK_WIDGET_DRAWABLE(widget) && state != GTK_STATE_ACTIVE)
+ if(gtk_widget_is_drawable(widget) && state != GTK_STATE_ACTIVE)
{
GtkStyle *style = gtk_widget_get_style(widget);
const guint EARSIZE = 5;
@@ -209,7 +206,7 @@ static void od_multibutton_paint_foreground(GtkWidget
g_return_if_fail(area != NULL);
g_return_if_fail(OD_IS_MULTIBUTTON(widget));
- if(GTK_WIDGET_DRAWABLE(widget))
+ if(gtk_widget_is_drawable(widget))
{
ODMultiButton *mb = OD_MULTIBUTTON(widget);
@@ -449,7 +446,7 @@ void od_multibutton_set_text(ODMultiButton *mb, guint
od_multibutton_reset_label(mb, index, GTK_LABEL(w), text, bg, fg);
if(GTK_WIDGET(mb)->parent)
gtk_widget_queue_resize(GTK_WIDGET(mb));
- if(GTK_WIDGET_DRAWABLE(mb))
+ if(gtk_widget_is_drawable(mb))
gtk_widget_queue_draw(GTK_WIDGET(mb));
}
}

4
x11/gentoo/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2010/03/21 09:13:53 jasper Exp $
@comment $OpenBSD: PLIST,v 1.8 2012/03/19 12:59:42 ajacoutot Exp $
@bin bin/gentoo
@man man/man1/gentoo.1
share/doc/gentoo/
@ -215,7 +215,9 @@ share/gentoo/icons/xbm2.xpm
share/gentoo/icons/xcf.xpm
share/gentoo/icons/xpm.xpm
share/gentoo/icons/xpm2.xpm
share/locale/ca/LC_MESSAGES/gentoo.mo
share/locale/de/LC_MESSAGES/gentoo.mo
share/locale/es/LC_MESSAGES/gentoo.mo
share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/gentoo.mo