diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
commit | 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch) | |
tree | 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /x11/libxklavier | |
parent | - Add goocanvas (diff) |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Notes
Notes:
svn path=/head/; revision=175261
Diffstat (limited to 'x11/libxklavier')
-rw-r--r-- | x11/libxklavier/Makefile | 20 | ||||
-rw-r--r-- | x11/libxklavier/distinfo | 6 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier.c | 18 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier_config.c | 15 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c | 20 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c | 22 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier_props.c | 28 | ||||
-rw-r--r-- | x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c | 12 | ||||
-rw-r--r-- | x11/libxklavier/pkg-plist | 24 |
9 files changed, 85 insertions, 80 deletions
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 2b5cc7d61a67..46030a627ffd 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -3,30 +3,32 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/libxklavier/Makefile,v 1.28 2006/09/10 00:51:15 mezz Exp $ # PORTNAME= libxklavier -PORTVERSION= 2.2 -PORTREVISION= 1 +PORTVERSION= 2.91 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= x11 -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 -DIST_SUBDIR= gnome2 +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= gswitchit MAINTAINER= gnome@FreeBSD.org COMMENT= An utility library to make XKB stuff easier -USE_X_PREFIX= yes +USE_XLIB= yes USE_GMAKE= yes -USE_GNOME= gnometarget gnomehack libxml2 -INSTALLS_SHLIB= yes +USE_GNOME= gnometarget gnomehack libxml2 glib20 +USE_LDCONFIG= yes USE_GETOPT_LONG=yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include CONFIGURE_ARGS= --disable-doxygen \ --with-xkb-base=${X11BASE}/lib/X11/xkb \ - --with-xmodmap-base=${X11BASE}/share/gnome/xmodmap + --with-xmodmap-base=${LOCALBASE}/share/gnome/xmodmap \ + --disable-gtk-doc \ + --with-html-dir=${GNOME_HTML_DIR} CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 22a33aafe04d..8456fa5a39e7 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/libxklavier-2.2.tar.gz) = a9c2e53ea96ed138b588df5a9b9addaf -SHA256 (gnome2/libxklavier-2.2.tar.gz) = ccfa44ca1128018939906ef32b3a0e85a08efacbc00a32d49628fee7026cc2de -SIZE (gnome2/libxklavier-2.2.tar.gz) = 467577 +MD5 (libxklavier-2.91.tar.gz) = 53d9864d165c86edb6a67f7ebe140814 +SHA256 (libxklavier-2.91.tar.gz) = 25c51adea53aed005d8b586289759e7402594d3326cd2f89bcdac54568c38f9b +SIZE (libxklavier-2.91.tar.gz) = 455935 diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c index 6355d7b772e6..d4b14aee6b60 100644 --- a/x11/libxklavier/files/patch-libxklavier_xklavier.c +++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c @@ -1,11 +1,11 @@ ---- libxklavier/xklavier.c.orig Tue Dec 13 00:52:26 2005 -+++ libxklavier/xklavier.c Tue Dec 13 00:52:45 2005 -@@ -606,7 +606,7 @@ - int level, const char format[], va_list args ) +--- libxklavier/xklavier.c.orig Sat Apr 15 21:14:40 2006 ++++ libxklavier/xklavier.c Tue Jun 13 00:07:32 2006 +@@ -394,7 +394,7 @@ xkl_default_log_appender(const gchar fil + gint level, const gchar format[], va_list args) { - time_t now = time( NULL ); -- fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file, function ); -+ fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", (long) now, level, file, function ); - vfprintf( stdout, format, args ); + time_t now = time(NULL); +- fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file, ++ fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", (long)now, level, file, + function); + vfprintf(stdout, format, args); } - diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c new file mode 100644 index 000000000000..889c14b89d85 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c @@ -0,0 +1,15 @@ +--- libxklavier/xklavier_config.c 2006-04-15 22:04:38.000000000 -0400 ++++ libxklavier/xklavier_config.c 2006-07-08 10:15:17.000000000 -0400 +@@ -275,7 +275,11 @@ + gchar * + xkl_strings_concat_comma_separated(gchar ** array) + { +- return g_strjoinv(",", array); ++ if (array) { ++ return g_strjoinv(",", array); ++ } else { ++ return g_strdup(""); ++ } + } + + void diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c index 0ef120607f55..91d73cf112a3 100644 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c @@ -1,11 +1,11 @@ ---- libxklavier/xklavier_config_i18n.c.orig Tue Nov 23 18:33:37 2004 -+++ libxklavier/xklavier_config_i18n.c Tue Nov 23 18:34:30 2004 -@@ -106,7 +106,7 @@ - iconv_t converter; - static char converted[XKL_MAX_CI_DESC_LENGTH]; - char *convertedStart = converted; -- char *utfStart = ( char * ) utf8string; -+ const char *utfStart = ( const char * ) utf8string; - size_t clen = XKL_MAX_CI_DESC_LENGTH - 1; - const char *charset; +--- libxklavier/xklavier_config_i18n.c.orig Tue Jun 13 00:12:44 2006 ++++ libxklavier/xklavier_config_i18n.c Tue Jun 13 00:13:05 2006 +@@ -108,7 +108,7 @@ xkl_locale_from_utf8(const gchar * utf8s + iconv_t converter; + gchar converted[XKL_MAX_CI_DESC_LENGTH]; + gchar *converted_start = converted; +- gchar *utf_start = (char *) utf8string; ++ const gchar *utf_start = (const char *) utf8string; + size_t clen = XKL_MAX_CI_DESC_LENGTH - 1; + const gchar *charset; diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c deleted file mode 100644 index 8dbfe37c7977..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c +++ /dev/null @@ -1,22 +0,0 @@ ---- libxklavier/xklavier_evt_xmm.c.orig Tue Nov 30 02:18:31 2004 -+++ libxklavier/xklavier_evt_xmm.c Tue Nov 30 02:20:24 2004 -@@ -13,15 +13,15 @@ - { - if( _xklListenerType & XKLL_MANAGE_LAYOUTS ) - { -- XklDebug( 200, "Processing the KeyPress event\n" ); - int currentShortcut = 0; - const XmmSwitchOptionPtr sop = _XklXmmFindSwitchOption( kpe->keycode, -- kpe->state, -- ¤tShortcut ); -+ kpe->state, -+ ¤tShortcut ); -+ XklDebug( 200, "Processing the KeyPress event\n" ); - if( sop != NULL ) - { -- XklDebug( 150, "It is THE shortcut\n" ); - XklState state; -+ XklDebug( 150, "It is THE shortcut\n" ); - _XklXmmGetRealState( &state ); - if( state.group != -1 ) - { diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c index 87dffde8985b..a56ec7896810 100644 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c @@ -1,13 +1,15 @@ ---- libxklavier/xklavier_props.c.orig Mon Apr 3 14:49:17 2006 -+++ libxklavier/xklavier_props.c Mon Apr 3 17:16:13 2006 -@@ -319,7 +324,9 @@ Bool XklGetNamesProp( Atom rulesAtom, - memcpy( var, varstart + 1, --varlen ); - var[varlen] = '\0'; - -- ( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0'; -+ *theLayout = realloc (*theLayout, laylen + 1); -+ (*theLayout)[laylen] = '\0'; -+ /*( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0';*/ - } - } - } +--- libxklavier/xklavier_props.c.orig Sun Apr 16 20:51:36 2006 ++++ libxklavier/xklavier_props.c Tue Jun 13 00:11:24 2006 +@@ -355,10 +355,8 @@ xkl_config_rec_get_from_root_window_prop + --varlen); + var[varlen] = '\0'; + /* Resize the original layout */ +- ((char *) +- g_realloc(*layout, +- laylen + 1))[laylen] = +- '\0'; ++ *layout = g_realloc(*layout, laylen + 1); ++ (*layout)[laylen] = '\0'; + } + } + layout++; diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c deleted file mode 100644 index 09658570e653..000000000000 --- a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c +++ /dev/null @@ -1,12 +0,0 @@ ---- libxklavier/xklavier_xmm.c.orig Tue Dec 13 00:58:22 2005 -+++ libxklavier/xklavier_xmm.c Tue Dec 13 00:58:47 2005 -@@ -66,7 +66,8 @@ - XmmSwitchOptionPtr _XklXmmGetCurrentShortcut( void ) - { - const char* optionName = _XklXmmGetCurrentShortcutOptionName(); -- XmmSwitchOptionPtr switchOption = allSwitchOptions; -+ XmmSwitchOptionPtr switchOption; -+ switchOption = allSwitchOptions; - XklDebug( 150, "Configured switch option: [%s]\n", optionName ); - if( optionName == NULL ) - return NULL; diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist index d669618f0bc2..8b2c1b17f954 100644 --- a/x11/libxklavier/pkg-plist +++ b/x11/libxklavier/pkg-plist @@ -1,10 +1,30 @@ include/libxklavier/xklavier.h -include/libxklavier/xklavier_config.h +include/libxklavier/xkl_config_item.h +include/libxklavier/xkl_config_rec.h +include/libxklavier/xkl_config_registry.h +include/libxklavier/xkl_engine.h +include/libxklavier/xkl_engine_marshal.h lib/libxklavier.a lib/libxklavier.la lib/libxklavier.so -lib/libxklavier.so.10 +lib/libxklavier.so.11 libdata/pkgconfig/libxklavier.pc +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libxklavier-XklConfigItem.html +%%DOCSDIR%%/libxklavier-XklConfigRec.html +%%DOCSDIR%%/libxklavier-XklConfigRegistry.html +%%DOCSDIR%%/libxklavier-XklEngine.html +%%DOCSDIR%%/libxklavier-xklavier.html +%%DOCSDIR%%/libxklavier.devhelp +%%DOCSDIR%%/libxklavier.devhelp2 +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png %%DATADIR%%/xfree86.xml @dirrm %%DATADIR%% +@dirrm %%DOCSDIR%% @dirrm include/libxklavier |