freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to 2.2.0.

Browse Source 
This version uses Pango to fix font problem with GTK+-2.4.0.
This commit is contained in:
Hajimu UMEMOTO
2004-05-15 17:37:42 +00:00
parent befd8a5025
commit 04021be937
7 changed files with 85 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sysutils/gkrellm2/Makefile
View File

@@ -6,8 +6,8 @@
#
PORTNAME= gkrellm
PORTVERSION= 2.1.28
PORTREVISION= 2
PORTVERSION= 2.2.0
#PORTREVISION= 0
CATEGORIES= sysutils ipv6
MASTER_SITES= http://web.wt.net/~billw/gkrellm/ \
${MASTER_SITE_LOCAL}
@@ -26,8 +26,6 @@ USE_RC_SUBR= YES
WRKSRC= ${WRKDIR}/${DISTNAME:C/[a-z]$//}
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-property
.if defined(GKRELLM_SERVER_ONLY)
BUILD_WRKSRC= ${WRKSRC}/server
INSTALL_WRKSRC= ${WRKSRC}/server
@@ -72,7 +70,8 @@ MAKE_ENV+= glib12=1
CFLAGS+= -DSYSTEM_THEMES_DIR='\"${X11BASE}/share/gkrellm2/themes\"' \
-DSYSTEM_PLUGINS_DIR='\"${X11BASE}/libexec/gkrellm2/plugins\"' \
-DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"'
-DGKRELLMD_SYS_ETC='\"${PREFIX}/etc\"' \
-DGKRELLMD_SYSTEM_PLUGINS_DIR='\"${PREFIX}/libexec/gkrellm2/plugins-gkrellmd\"'
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
RC_SUBR=${RC_SUBR}
@@ -92,6 +91,7 @@ post-install:
@${CHMOD} 2511 ${X11BASE}/bin/gkrellm
.endif
@${CHMOD} 2511 ${PREFIX}/sbin/gkrellmd
@${MKDIR} ${PREFIX}/libexec/gkrellm2/plugins-gkrellmd
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/gkrellmd.sh > ${PREFIX}/etc/rc.d/gkrellmd.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/gkrellmd.sh
@@ -103,8 +103,8 @@ post-install:
fi
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for file in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
.endfor
.endif

4
sysutils/gkrellm2/distinfo
View File

@@ -1,2 +1,2 @@
MD5 (gkrellm-2.1.28.tar.bz2) = a3f0d0c8a7e8eda345ab9a0aa0038f8b
SIZE (gkrellm-2.1.28.tar.bz2) = 633487
MD5 (gkrellm-2.2.0.tar.bz2) = 354e0f878d2bc8f7fe9a1a745bf136c2
SIZE (gkrellm-2.2.0.tar.bz2) = 663376

159
sysutils/gkrellm2/files/extra-patch-property
View File

@@ -1,159 +0,0 @@
diff -ur src/gkrellm-private.h src/gkrellm-private.h
--- src/gkrellm-private.h Tue Jan 20 08:46:29 2004
+++ src/gkrellm-private.h Tue Apr 13 01:24:00 2004
@@ -480,6 +484,8 @@
void gkrellm_winop_place_gkrellm(gchar *);
void gkrellm_winop_flush_motion_events(void);
gboolean gkrellm_winop_updated_background(void);
+void gkrellm_winop_update_struts(void);
+void gkrellm_winop_withdrawn(void);
gboolean gkrellm_winop_draw_rootpixmap_onto_transparent_panel(GkrellmPanel *);
gboolean gkrellm_winop_draw_rootpixmap_onto_transparent_chart(GkrellmChart *);
void gkrellm_winop_apply_rootpixmap_transparency(void);
diff -ur src/main.c src/main.c
--- src/main.c Sat Jan 17 07:51:37 2004
+++ src/main.c Mon Apr 12 23:29:12 2004
@@ -1664,6 +1664,9 @@
else if (_GK.debug_level & DEBUG_POSITION)
printf("locked configure-event: x=%d y=%d\n", x, y);
+ if (size_change || position_change)
+ gkrellm_winop_update_struts();
+
if (do_intro)
{
do_intro = FALSE;
@@ -2216,6 +2219,7 @@
gtk_window_stick(GTK_WINDOW(top_window));
gkrellm_winop_options(argc, argv);
gtk_widget_show(gtree.window);
+ gkrellm_winop_withdrawn();
if (geometry || _GK.save_position)
configure_position_lock = TRUE; /* see cb_configure_notify */
diff -ur src/winops-x11.c src/winops-x11.c
--- src/winops-x11.c Wed Jan 7 12:04:24 2004
+++ src/winops-x11.c Tue Apr 13 01:11:15 2004
@@ -270,6 +270,76 @@
return TRUE;
}
+enum
+ {
+ STRUT_LEFT = 0,
+ STRUT_RIGHT = 1,
+ STRUT_TOP = 2,
+ STRUT_BOTTOM = 3,
+ STRUT_LEFT_START = 4,
+ STRUT_LEFT_END = 5,
+ STRUT_RIGHT_START = 6,
+ STRUT_RIGHT_END = 7,
+ STRUT_TOP_START = 8,
+ STRUT_TOP_END = 9,
+ STRUT_BOTTOM_START = 10,
+ STRUT_BOTTOM_END = 11
+ };
+
+static Atom net_wm_strut_partial = None;
+static Atom net_wm_strut = None;
+
+void
+gkrellm_winop_update_struts(void)
+ {
+ gulong struts[12] = { 0, };
+ Display *display;
+ Window window;
+ gint width;
+ gint height;
+
+ if (!_GK.is_dock_type)
+ return;
+
+ display = GDK_WINDOW_XDISPLAY(gkrellm_get_top_window()->window);
+ window = GDK_WINDOW_XWINDOW(gkrellm_get_top_window()->window);
+
+ if (net_wm_strut_partial == None)
+ {
+ net_wm_strut_partial
+ = XInternAtom(display, "_NET_WM_STRUT_PARTIAL", False);
+ }
+ if (net_wm_strut == None)
+ {
+ net_wm_strut = XInternAtom(display, "_NET_WM_STRUT", False);
+ }
+
+ width = _GK.chart_width + _GK.frame_left_width + _GK.frame_right_width;
+ height = _GK.monitor_height + _GK.total_frame_height;
+
+ if (_GK.x_position == 0)
+ {
+ struts[STRUT_LEFT] = width;
+ struts[STRUT_LEFT_START] = _GK.y_position;
+ struts[STRUT_LEFT_END] = _GK.y_position + height;
+ }
+ else if (_GK.x_position == _GK.w_display - width)
+ {
+ struts[STRUT_RIGHT] = width;
+ struts[STRUT_RIGHT_START] = _GK.y_position;
+ struts[STRUT_RIGHT_END] = _GK.y_position + height;
+ }
+
+ gdk_error_trap_push();
+ XChangeProperty (display, window, net_wm_strut,
+ XA_CARDINAL, 32, PropModeReplace,
+ (guchar *) &struts, 4);
+ XChangeProperty (display, window, net_wm_strut_partial,
+ XA_CARDINAL, 32, PropModeReplace,
+ (guchar *) &struts, 12);
+ gdk_error_trap_pop();
+ }
+
void
gkrellm_winop_options(gint argc, gchar **argv)
{
@@ -332,22 +402,32 @@
XChangeProperty(display, window,
XInternAtom(display, "_NET_WM_STATE", False),
XA_ATOM, 32, PropModeReplace, (guchar *) atoms, n);
+ }
+
+void
+gkrellm_winop_withdrawn(void)
+ {
+ Display *display;
+ Window window;
- if (_GK.withdrawn)
+
+ if (!_GK.withdrawn)
+ return;
+ display = GDK_WINDOW_XDISPLAY(gkrellm_get_top_window()->window);
+ window = GDK_WINDOW_XWINDOW(gkrellm_get_top_window()->window);
+
+ if (!_GK.is_dock_type)
{
- if (!_GK.is_dock_type)
- {
- XWMHints mywmhints;
- mywmhints.initial_state = WithdrawnState;
- mywmhints.flags=StateHint;
-
- XSetWMHints(display, window, &mywmhints);
- }
- else
- gkrellm_message_dialog(NULL,
- _("Warning: -w flag is ignored when the window dock type is set"));
+ XWMHints mywmhints;
+ mywmhints.initial_state = WithdrawnState;
+ mywmhints.flags=StateHint;
+
+ XSetWMHints(display, window, &mywmhints);
}
- }
+ else
+ gkrellm_message_dialog(NULL,
+ _("Warning: -w flag is ignored when the window dock type is set"));
+ }
/* Use XParseGeometry, but width and height are ignored.
| If GKrellM is moved, update _GK.y_position.

37
sysutils/gkrellm2/files/patch-gkrellmd.1 Normal file
View File

@@ -0,0 +1,37 @@
Index: gkrellmd.1
diff -u gkrellmd.1.orig gkrellmd.1
--- gkrellmd.1.orig Mon Apr 12 12:01:47 2004
+++ gkrellmd.1 Tue Apr 13 17:14:02 2004
@@ -1,4 +1,4 @@
-.TH gkrellmd 1 "June 7, 2003" "GNU/Linux" "User's Manual"
+.TH gkrellmd 1 "June 7, 2003" "FreeBSD" "User's Manual"
.SH "NAME"
gkrellmd \- The GNU Krell Monitors Server
@@ -242,7 +242,7 @@
.SH "FILES"
.TP
-.I /etc/gkrellmd.conf
+.I /usr/local/etc/gkrellmd.conf
System server config which is read first.
The config file may contain lines similar to the command line args.
For example:
@@ -281,16 +281,13 @@
.RE
.TP
-.I /usr/local/etc/gkrellmd.conf
-Local server config file which is read second.
-.TP
.I ~/.gkrellmd.conf
User server config file which is read last.
.TP
.I ~/.gkrellm2/plugins-gkrellmd
User server plugin directory.
.TP
-.I /usr/lib/gkrellm2/plugins-gkrellmd
+.I /usr/local/libexec/gkrellm2/plugins-gkrellmd
System wide server plugin directory.
.TP
.I /usr/local/lib/gkrellm2/plugins-gkrellmd

40
sysutils/gkrellm2/files/patch-server::Makefile
View File

@@ -1,30 +1,38 @@
Index: server/Makefile
diff -u server/Makefile.orig server/Makefile
--- server/Makefile.orig Tue Sep 17 04:36:14 2002
+++ server/Makefile Fri Sep 20 18:33:15 2002
@@ -13,12 +13,12 @@
--- server/Makefile.orig Mon Apr 12 22:30:48 2004
+++ server/Makefile Tue Apr 13 14:15:40 2004
@@ -27,18 +27,18 @@
PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0`
PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gthread-2.0`
PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
-GLIB12_INCLUDE = `glib-config --cflags gthread`
-GLIB12_LIB = `glib-config --libs gthread`
+GLIB12_INCLUDE = `$(GLIB_CONFIG) --cflags gthread`
+GLIB12_LIB = `$(GLIB_CONFIG) --libs gthread`
-GLIB12_INCLUDE = `glib-config --cflags`
-GLIB12_LIB = `glib-config --libs glib gmodule`
+GLIB12_INCLUDE = `$(GLIB_CONFIG) --cflags`
+GLIB12_LIB = `$(GLIB_CONFIG) --libs glib gmodule`
-FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) -I$(LOCALBASE)/include
+FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
ifeq ($(glib12),1)
-FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE) -I$(LOCALBASE)/include
+FLAGS = -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
endif
ifeq ($(glib12),yes)
-FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
+FLAGS = -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
endif
FLAGS+= $(PTHREAD_INC)
@@ -81,7 +81,7 @@
install:
$(INSTALL) -c $(STRIP) -m $(BINMODE) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
-FLAGS+= $(PTHREAD_INC)
+FLAGS+= $(PTHREAD_INC) -I$(LOCALBASE)/include
LIBS = $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS)
ifeq ($(glib12),1)
@@ -133,7 +133,7 @@
$(INSTALL) -d -m $(INCLUDEDIRMODE) $(INCLUDEDIR)/gkrellm2
$(INSTALL) -c -m $(INCLUDEMODE) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
- $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
+ $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).8
install_darwin:
$(MAKE) install STRIP=
uninstall:
rm -f $(SINSTALLDIR)/$(PACKAGE_D)

11
sysutils/gkrellm2/files/patch-server::gkrellmd.h
View File

@@ -1,14 +1,17 @@
Index: server/gkrellmd.h
diff -u server/gkrellmd.h.orig server/gkrellmd.h
--- server/gkrellmd.h.orig Tue Aug 13 01:58:55 2002
+++ server/gkrellmd.h Thu Aug 29 18:47:14 2002
@@ -107,7 +107,9 @@
#define GKRELLMD_CONFIG "gkrellmd.conf"
--- server/gkrellmd.h.orig Mon Apr 12 23:32:29 2004
+++ server/gkrellmd.h Tue Apr 13 17:16:02 2004
@@ -105,8 +105,12 @@
#endif
#if !defined(WIN32)
+#if !defined(GKRELLMD_SYS_ETC)
#define GKRELLMD_SYS_ETC "/etc"
+#endif
+#if 0
#define GKRELLMD_LOCAL_ETC "/usr/local/etc"
+#endif
#endif

13
sysutils/gkrellm2/pkg-plist
View File

@@ -4,15 +4,19 @@ sbin/gkrellmd
%%PORTDOCS%%share/doc/gkrellm/README
%%PORTDOCS%%share/doc/gkrellm/Themes.html
%%PORTDOCS%%@dirrm share/doc/gkrellm
@exec mkdir -p %D/libexec/gkrellm2/plugins-gkrellmd
@unexec if cmp -s %D/etc/gkrellmd.conf %D/etc/gkrellmd.conf.sample; then rm -f %D/etc/gkrellmd.conf; fi
etc/gkrellmd.conf.sample
@exec [ -f %B/gkrellmd.conf ] || cp %B/%f %B/gkrellmd.conf
etc/rc.d/gkrellmd.sh
%%CLIENT%%@cwd %%X11BASE%%
%%CLIENT%%man/man1/gkrellm.1.gz
%%CLIENT%%bin/gkrellm
@cwd %%X11BASE%%
%%CLIENT%%include/gkrellm2/gkrellm.h
%%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
include/gkrellm2/gkrellmd.h
@dirrm include/gkrellm2
%%CLIENT%%man/man1/gkrellm.1.gz
%%CLIENT%%@unexec rm -f %D/man/cat1/gkrellm.1 %D/man/cat1/gkrellm.1.gz
%%CLIENT%%bin/gkrellm
%%CLIENT%%libdata/pkgconfig/gkrellm.pc
%%CLIENT%%share/locale/cs/LC_MESSAGES/gkrellm.mo
%%CLIENT%%share/locale/da/LC_MESSAGES/gkrellm.mo
@@ -26,11 +30,10 @@ etc/rc.d/gkrellmd.sh
%%CLIENT%%share/locale/ru/LC_MESSAGES/gkrellm.mo
%%CLIENT%%share/locale/sl/LC_MESSAGES/gkrellm.mo
%%CLIENT%%share/locale/sv/LC_MESSAGES/gkrellm.mo
%%CLIENT%%@dirrm include/gkrellm2
%%CLIENT%%@exec mkdir -p %D/libexec/gkrellm2/plugins
%%CLIENT%%@exec mkdir -p %D/share/gkrellm2/themes
%%CLIENT%%@unexec rmdir %D/libexec/gkrellm2/plugins 2>/dev/null || true
%%CLIENT%%@unexec rmdir %D/libexec/gkrellm2 2>/dev/null || true
%%CLIENT%%@unexec rmdir %D/share/gkrellm2/themes 2>/dev/null || true
%%CLIENT%%@unexec rmdir %D/share/gkrellm2 2>/dev/null || true
%%CLIENT%%@cwd %%PREFIX%%
@cwd %%PREFIX%%