1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

Add gswitchit after a repo move from gswitchit_applet. GSwitchit is a

keyboard layout switching applet for the GNOME 2 desktop.

Approved by:	sobomax
This commit is contained in:
Joe Marcus Clarke 2003-06-02 22:05:04 +00:00
parent 1b4109fdef
commit 8bda45d50b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=82055
8 changed files with 229 additions and 145 deletions

View File

@ -1,35 +1,27 @@
# Ports collection Makefile for: gswitchit_applet
# Date created: 5 June 2000
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
# Ports collection Makefile for: gswitchit
# Date created: 15 May 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
#
PORTNAME= gswitchit_applet
PORTVERSION= 0.92
PORTNAME= gswitchit
PORTVERSION= 2.0.31
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gswitchit
MAINTAINER= sobomax@FreeBSD.org
MAINTAINER= gnome@FreeBSD.org
COMMENT= A simple keyboard state indicator and switcher for GNOME Desktop
LIB_DEPENDS= xklavier.0:${PORTSDIR}/x11/libxklavier
RUN_DEPENDS= ${X11BASE}/lib/X11/xkb/rules/xfree86.xml:${PORTSDIR}/x11/xfree86_xkb_xml
LIB_DEPENDS= xklavier.5:${PORTSDIR}/x11/libxklavier
RUN_DEPENDS= ${X11BASE}/lib/X11/xkb/rules/xfree86.xml:${PORTSDIR}/x11/XFree86-4-clients
USE_X_PREFIX= yes
USE_GNOME= yes
USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gnomepanel
USE_LIBTOOL= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MAN1= gswitchit_applet.1
pre-patch:
@${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
${WRKSRC}/configure
@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (gswitchit_applet-0.92.tar.gz) = 5a14ce9a6ed42997882b5e34c8e00647
MD5 (gswitchit-2.0.31.tar.gz) = a2735f2199f4525827bd08c956e9ef81

View File

@ -1,22 +0,0 @@
$FreeBSD$
--- capplet/Makefile.in.orig Fri May 31 14:39:19 2002
+++ capplet/Makefile.in Fri May 31 14:58:45 2002
@@ -169,6 +169,7 @@
../src/gswitchit_config.o \
-lxklavier \
-lxkbfile \
+ -lxml2 \
$(GDK_PIXBUF_LIBS) \
$(GCONF_LIBS) \
$(BONOBO_LIBS) \
@@ -195,7 +196,7 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I..
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = $(GDK_PIXBUF_CFLAGS) @CPPFLAGS@
LIBS = @LIBS@
gswitchit_properties_capplet_OBJECTS = gswitchit_capplet.$(OBJEXT)
gswitchit_properties_capplet_DEPENDENCIES = ../src/gswitchit_config.o

View File

@ -0,0 +1,16 @@
--- capplets/xkb_capplet.c.orig Thu May 15 01:41:56 2003
+++ capplets/xkb_capplet.c Thu May 15 01:42:18 2003
@@ -222,11 +222,12 @@
CURRENT_OPTION_GROUP_NAME_PROPERTY, NULL );
} else if( GTK_IS_OPTION_MENU( optionsCtl ) ) // singlesel
{
+ const gchar *optionName;
theItem =
gtk_menu_get_active( GTK_MENU
( gtk_option_menu_get_menu
( GTK_OPTION_MENU( optionsCtl ) ) ) );
- const gchar *optionName = gtk_widget_get_name( theItem );
+ optionName = gtk_widget_get_name( theItem );
XklDebug( 200, "Option [%s:%s] selected \n", groupName, optionName );
if( optionName != NULL && *optionName != '\0' )
GSwitchItConfigXkbOptionsAdd( &gswic->config, groupName, optionName );

View File

@ -1,9 +1,6 @@
$FreeBSD$
--- configure.orig Fri May 31 14:03:58 2002
+++ configure Fri May 31 14:04:45 2002
@@ -5925,6 +5925,7 @@
--- configure.orig Fri May 9 18:17:04 2003
+++ configure Thu May 15 01:54:40 2003
@@ -7865,6 +7865,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@ -11,52 +8,14 @@ $FreeBSD$
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8524,10 +8525,10 @@
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+extern int *_nl_domain_bindings__;
int main() {
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings__
; return 0; }
EOF
if { (eval echo configure:8534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -8913,7 +8914,7 @@
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+extern int *_nl_domain_bindings__;
extern
#ifdef __cplusplus
"C"
@@ -8921,7 +8922,7 @@
const char *_nl_expand_alias ();
int main() {
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings__ + *_nl_expand_alias (0)
; return 0; }
EOF
if { (eval echo configure:8928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -8941,7 +8942,7 @@
#include "confdefs.h"
#include <libintl.h>
extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
+extern int *_nl_domain_bindings__;
extern
#ifdef __cplusplus
"C"
@@ -8949,7 +8950,7 @@
const char *_nl_expand_alias ();
int main() {
bindtextdomain ("", "");
-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
+return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings__ + *_nl_expand_alias (0)
; return 0; }
EOF
if { (eval echo configure:8956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -8082,8 +8083,8 @@
-prefix=`$PKG_CONFIG --variable=prefix libgnome-2.0`
-exec_prefix=`$PKG_CONFIG --variable=exec_prefix libgnome-2.0`
+#prefix=`$PKG_CONFIG --variable=prefix libgnome-2.0`
+#exec_prefix=`$PKG_CONFIG --variable=exec_prefix libgnome-2.0`
# Check whether --enable-install_schemas or --disable-install_schemas was given.
if test "${enable_install_schemas+set}" = set; then

View File

@ -0,0 +1,11 @@
--- intltool-merge.in.orig Thu May 15 00:47:23 2003
+++ intltool-merge.in Thu May 15 00:47:52 2003
@@ -461,7 +461,7 @@
{
my ($pre_encoded) = @_;
- my @list_of_chars = unpack ('U*', $pre_encoded);
+ my @list_of_chars = unpack ('C*', $pre_encoded);
if ($PASS_THROUGH_ARG)
{

View File

@ -1,13 +0,0 @@
$FreeBSD$
--- src/Makefile.in 2002/05/31 11:13:42 1.1
+++ src/Makefile.in 2002/05/31 11:14:13
@@ -176,6 +176,7 @@
$(GDK_PIXBUF_LIBS) \
$(GCONF_LIBS) \
-lxklavier \
+ -lxkbfile \
-lgconf-gtk-1
gswitchit_applet_MANS = ../man/gswitchit_applet.1

View File

@ -1,44 +1,185 @@
bin/gswitchit-properties_capplet
bin/gswitchit_applet
bin/xkb-properties_capplet
etc/CORBA/servers/gswitchit_applet.gnorba
etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/General/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/XKB/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/General/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/XKB/%gconf.xml
etc/gconf/schemas/gswitchit_applet.schemas
share/gnome/applets/Utility/gswitchit_applet.desktop
share/gnome/apps/Settings/XKB/.directory
share/gnome/apps/Settings/XKB/gswitchit-properties.desktop
share/gnome/apps/Settings/XKB/xkb-properties.desktop
share/gnome/control-center/capplets/XKB/.directory
share/gnome/control-center/capplets/XKB/gswitchit-properties.desktop
share/gnome/control-center/capplets/XKB/xkb-properties.desktop
share/gnome/gswitchit_applet/interfaces/gswitchit_applet.glade
bin/gswitchit-properties-capplet
bin/xkb-properties-capplet
etc/gconf/gconf.xml.defaults/apps/gswitchit/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gswitchit/General/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/gswitchit/XKB/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/General/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/XKB/%gconf.xml
etc/gconf/schemas/gswitchit.schemas
libdata/bonobo/servers/GNOME_GSwitchItApplet.server
libexec/gswitchit-applet
share/gnome/control-center-2.0/capplets/gswitchit-properties.desktop
share/gnome/control-center-2.0/capplets/xkb-properties.desktop
share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
share/gnome/gswitchit/interfaces/gswitchit-properties.glade
share/gnome/gswitchit/interfaces/xkb-properties.glade
share/gnome/help/gswitchit/C/III.applet.png
share/gnome/help/gswitchit/C/applet.gif
share/gnome/help/gswitchit/C/applet.popup.png
share/gnome/help/gswitchit/C/gb.applet.png
share/gnome/help/gswitchit/C/gc.png
share/gnome/help/gswitchit/C/gswitchit-applet.xml
share/gnome/help/gswitchit/C/gswitchit-properties-capplet.xml
share/gnome/help/gswitchit/C/gswitchit.xml
share/gnome/help/gswitchit/C/intro.xml
share/gnome/help/gswitchit/C/legal.xml
share/gnome/help/gswitchit/C/refs.xml
share/gnome/help/gswitchit/C/ru.applet.png
share/gnome/help/gswitchit/C/us.applet.png
share/gnome/help/gswitchit/C/xkb-properties-capplet.xml
share/gnome/help/gswitchit/C/xkb.xml
share/gnome/help/gswitchit/C/xpc.1.png
share/gnome/help/gswitchit/C/xpc.2.png
share/gnome/help/gswitchit/C/xpc.3.png
share/gnome/help/gswitchit/C/xpc.4.png
share/gnome/help/gswitchit/C/xpc.5.png
share/gnome/help/gswitchit/C/xpc.layout_tree.png
share/gnome/help/gswitchit/ru/III.applet.png
share/gnome/help/gswitchit/ru/applet.gif
share/gnome/help/gswitchit/ru/applet.popup.png
share/gnome/help/gswitchit/ru/gb.applet.png
share/gnome/help/gswitchit/ru/gc.png
share/gnome/help/gswitchit/ru/gswitchit-applet.xml
share/gnome/help/gswitchit/ru/gswitchit-properties-capplet.xml
share/gnome/help/gswitchit/ru/gswitchit.xml
share/gnome/help/gswitchit/ru/intro.xml
share/gnome/help/gswitchit/ru/legal.xml
share/gnome/help/gswitchit/ru/refs.xml
share/gnome/help/gswitchit/ru/ru.applet.png
share/gnome/help/gswitchit/ru/us.applet.png
share/gnome/help/gswitchit/ru/xkb-properties-capplet.xml
share/gnome/help/gswitchit/ru/xkb.xml
share/gnome/help/gswitchit/ru/xpc.1.png
share/gnome/help/gswitchit/ru/xpc.2.png
share/gnome/help/gswitchit/ru/xpc.3.png
share/gnome/help/gswitchit/ru/xpc.4.png
share/gnome/help/gswitchit/ru/xpc.5.png
share/gnome/help/gswitchit/ru/xpc.layout_tree.png
share/gnome/omf/gswitchit/gswitchit-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gswitchit/gswitchit-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/gswitchit/gswitchit-ru.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gswitchit/gswitchit-ru.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/gswitchit-applet.png
share/gnome/pixmaps/gswitchit-properties-capplet.png
share/gnome/pixmaps/gswitchit/III.xpm
share/gnome/pixmaps/gswitchit/IV.xpm
share/gnome/pixmaps/gswitchit/ae.xpm
share/gnome/pixmaps/gswitchit/af.xpm
share/gnome/pixmaps/gswitchit/am.xpm
share/gnome/pixmaps/gswitchit/ar.xpm
share/gnome/pixmaps/gswitchit/at.xpm
share/gnome/pixmaps/gswitchit/az.xpm
share/gnome/pixmaps/gswitchit/be.xpm
share/gnome/pixmaps/gswitchit/bg.xpm
share/gnome/pixmaps/gswitchit/bh.xpm
share/gnome/pixmaps/gswitchit/br.xpm
share/gnome/pixmaps/gswitchit/bu.xpm
share/gnome/pixmaps/gswitchit/by-alt.xpm
share/gnome/pixmaps/gswitchit/by.xpm
share/gnome/pixmaps/gswitchit/ca.xpm
share/gnome/pixmaps/gswitchit/ch.xpm
share/gnome/pixmaps/gswitchit/cu.xpm
share/gnome/pixmaps/gswitchit/cz.xpm
share/gnome/pixmaps/gswitchit/da.xpm
share/gnome/pixmaps/gswitchit/de.xpm
share/gnome/pixmaps/gswitchit/dj.xpm
share/gnome/pixmaps/gswitchit/dz.xpm
share/gnome/pixmaps/gswitchit/ee.xpm
share/gnome/pixmaps/gswitchit/eg.xpm
share/gnome/pixmaps/gswitchit/el.xpm
share/gnome/pixmaps/gswitchit/gswitchit.png
share/gnome/pixmaps/gswitchit/en7.xpm
share/gnome/pixmaps/gswitchit/es.xpm
share/gnome/pixmaps/gswitchit/eu.xpm
share/gnome/pixmaps/gswitchit/fi.xpm
share/gnome/pixmaps/gswitchit/fr.xpm
share/gnome/pixmaps/gswitchit/gb.xpm
share/gnome/pixmaps/gswitchit/ge.xpm
share/gnome/pixmaps/gswitchit/hr.xpm
share/gnome/pixmaps/gswitchit/hu.xpm
share/gnome/pixmaps/gswitchit/ie.xpm
share/gnome/pixmaps/gswitchit/il.xpm
share/gnome/pixmaps/gswitchit/init.xpm
share/gnome/pixmaps/gswitchit/iq.xpm
share/gnome/pixmaps/gswitchit/is.xpm
share/gnome/pixmaps/gswitchit/it.xpm
share/gnome/pixmaps/gswitchit/jo.xpm
share/gnome/pixmaps/gswitchit/jp.xpm
share/gnome/pixmaps/gswitchit/km.xpm
share/gnome/pixmaps/gswitchit/kw.xpm
share/gnome/pixmaps/gswitchit/la.xpm
share/gnome/pixmaps/gswitchit/lb.xpm
share/gnome/pixmaps/gswitchit/lt.xpm
share/gnome/pixmaps/gswitchit/lv.xpm
share/gnome/pixmaps/gswitchit/ly.xpm
share/gnome/pixmaps/gswitchit/ma.xpm
share/gnome/pixmaps/gswitchit/mk.xpm
share/gnome/pixmaps/gswitchit/mn.xpm
share/gnome/pixmaps/gswitchit/mx.xpm
share/gnome/pixmaps/gswitchit/nl.xpm
share/gnome/pixmaps/gswitchit/no.xpm
share/gnome/pixmaps/gswitchit/om.xpm
share/gnome/pixmaps/gswitchit/pl.xpm
share/gnome/pixmaps/gswitchit/ps.xpm
share/gnome/pixmaps/gswitchit/pt.xpm
share/gnome/pixmaps/gswitchit/qc.xpm
share/gnome/pixmaps/gswitchit/ro.xpm
share/gnome/pixmaps/gswitchit/ru.xpm
share/gnome/pixmaps/gswitchit/ru7.xpm
share/gnome/pixmaps/gswitchit/ru_new.xpm
share/gnome/pixmaps/gswitchit/sa.xpm
share/gnome/pixmaps/gswitchit/si.xpm
share/gnome/pixmaps/gswitchit/sk.xpm
share/gnome/pixmaps/gswitchit/so.xpm
share/gnome/pixmaps/gswitchit/su.xpm
share/gnome/pixmaps/gswitchit/sv.xpm
share/gnome/pixmaps/gswitchit/sy.xpm
share/gnome/pixmaps/gswitchit/th.xpm
share/gnome/pixmaps/gswitchit/tn.xpm
share/gnome/pixmaps/gswitchit/tr.xpm
share/gnome/pixmaps/gswitchit/ua.xpm
share/gnome/pixmaps/gswitchit/uk.xpm
share/gnome/pixmaps/gswitchit/us.xpm
share/gnome/pixmaps/gswitchit/xkb.png
share/locale/bg/LC_MESSAGES/gswitchit_applet.mo
share/locale/de/LC_MESSAGES/gswitchit_applet.mo
share/locale/el/LC_MESSAGES/gswitchit_applet.mo
share/locale/ru/LC_MESSAGES/gswitchit_applet.mo
share/locale/sv/LC_MESSAGES/gswitchit_applet.mo
share/gnome/pixmaps/gswitchit/us_new.xpm
share/gnome/pixmaps/gswitchit/uy.xpm
share/gnome/pixmaps/gswitchit/vn.xpm
share/gnome/pixmaps/gswitchit/ye.xpm
share/gnome/pixmaps/gswitchit/yu.xpm
share/gnome/pixmaps/xkb-properties-capplet.png
share/locale/am/LC_MESSAGES/gswitchit.mo
share/locale/bg/LC_MESSAGES/gswitchit.mo
share/locale/cs/LC_MESSAGES/gswitchit.mo
share/locale/de/LC_MESSAGES/gswitchit.mo
share/locale/el/LC_MESSAGES/gswitchit.mo
share/locale/es/LC_MESSAGES/gswitchit.mo
share/locale/fa/LC_MESSAGES/gswitchit.mo
share/locale/fr/LC_MESSAGES/gswitchit.mo
share/locale/ja/LC_MESSAGES/gswitchit.mo
share/locale/lv/LC_MESSAGES/gswitchit.mo
share/locale/mn/LC_MESSAGES/gswitchit.mo
share/locale/nl/LC_MESSAGES/gswitchit.mo
share/locale/no/LC_MESSAGES/gswitchit.mo
share/locale/pt/LC_MESSAGES/gswitchit.mo
share/locale/pt_BR/LC_MESSAGES/gswitchit.mo
share/locale/ru/LC_MESSAGES/gswitchit.mo
share/locale/sr/LC_MESSAGES/gswitchit.mo
share/locale/sr@Latn/LC_MESSAGES/gswitchit.mo
share/locale/sv/LC_MESSAGES/gswitchit.mo
share/locale/uk/LC_MESSAGES/gswitchit.mo
share/locale/vi/LC_MESSAGES/gswitchit.mo
share/locale/zh_CN/LC_MESSAGES/gswitchit.mo
@dirrm share/gnome/pixmaps/gswitchit
@dirrm share/gnome/gswitchit_applet/interfaces
@dirrm share/gnome/gswitchit_applet
@dirrm share/gnome/control-center/capplets/XKB
@dirrm share/gnome/apps/Settings/XKB
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/XKB
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet/General
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit_applet
@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/XKB
@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit_applet/General
@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit_applet
@dirrm share/gnome/omf/gswitchit
@dirrm share/gnome/help/gswitchit/ru
@dirrm share/gnome/help/gswitchit/C
@dirrm share/gnome/help/gswitchit
@dirrm share/gnome/gswitchit/interfaces
@dirrm share/gnome/gswitchit
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/XKB
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit/General
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gswitchit
@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit/XKB
@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit/General
@dirrm etc/gconf/gconf.xml.defaults/apps/gswitchit
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gswitchit/gswitchit-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gswitchit/gswitchit-ru.omf 2>/dev/null || /usr/bin/true