Author: arekm Date: Sat Jan 22 15:20:28 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 1.4.9; patches from fc; doesn't build unfortunately
---- Files affected: packages/scim: scim.spec (1.6 -> 1.7) , scim-1.4.7-syslibltdl.patch (NONE -> 1.1) (NEW), scim-1.4.8-fix-dlopen.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/scim/scim.spec diff -u packages/scim/scim.spec:1.6 packages/scim/scim.spec:1.7 --- packages/scim/scim.spec:1.6 Mon Aug 27 00:23:38 2007 +++ packages/scim/scim.spec Sat Jan 22 16:20:23 2011 @@ -2,12 +2,14 @@ Summary: Smart Common Input Method Summary(pl.UTF-8): Smart Common Input Method - ogólna metoda wprowadzania Name: scim -Version: 1.4.7 +Version: 1.4.9 Release: 1 License: LGPL v2+ Group: X11/Applications Source0: http://dl.sourceforge.net/scim/%{name}-%{version}.tar.gz -# Source0-md5: 840dcfd4264a1443478c188ff747984e +# Source0-md5: 975ba34b01304ea8166ac8ea27aa9e88 +Patch0: scim-1.4.7-syslibltdl.patch +Patch1: scim-1.4.8-fix-dlopen.patch URL: http://www.scim-im.org/ BuildRequires: autoconf >= 2.59-9 BuildRequires: automake @@ -59,18 +61,23 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 -# outdated, use system version -:>m4/intltool.m4 +for f in m4/intltool.m4 $(grep -l gettext- m4/*.m4 | xargs); do + :> $f +done %build -%{__intltoolize} %{__gettextize} +%{__intltoolize} %{__libtoolize} %{__aclocal} -I m4 %{__autoconf} %configure \ - --with-gtk-im-module-dir=%{immodulesdir} + --enable-ld-version-script \ + --with-gtk-im-module-dir=%{immodulesdir} \ + --disable-ltdl-install %{__make} %install @@ -150,6 +157,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.7 2011/01/22 15:20:23 arekm +- up to 1.4.9; patches from fc; doesn't build unfortunately + Revision 1.6 2007/08/26 22:23:38 qboosh - updated to 1.4.7 - intltool hack, builds now ================================================================ Index: packages/scim/scim-1.4.7-syslibltdl.patch diff -u /dev/null packages/scim/scim-1.4.7-syslibltdl.patch:1.1 --- /dev/null Sat Jan 22 16:20:29 2011 +++ packages/scim/scim-1.4.7-syslibltdl.patch Sat Jan 22 16:20:23 2011 @@ -0,0 +1,61 @@ +Index: scim-1.4.7/src/Makefile.am +=================================================================== +--- scim-1.4.7.orig/src/Makefile.am ++++ scim-1.4.7/src/Makefile.am +@@ -33,7 +33,7 @@ INCLUDES = -I$(top_builddir) \ + -DSCIM_MODULE_PATH=\"@SCIM_MODULE_PATH@\" + + +-noinst_HEADERS = ltdl.h \ ++noinst_HEADERS = \ + scim_private.h \ + scim_compose_key_data.h \ + scim_keyboard_layout_data.h \ +@@ -84,11 +84,6 @@ libsciminclude_HEADERS = scim.h \ + scim_utility.h + + +-noinst_LTLIBRARIES = libltdlc.la +- +-libltdlc_la_SOURCES = ltdl.cpp +-libltdlc_la_LIBADD = $(LIBADD_DL) +- + if SCIM_LD_VERSION_SCRIPT + LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/libscim.version-script" + endif +@@ -137,7 +132,7 @@ libscim@SCIM_EPOCH@_la_LDFLAGS= -version + @LTLIBINTL@ \ + -lstdc++ + +-libscim@SCIM_EPOCH@_la_LIBADD = libltdlc.la ++libscim@SCIM_EPOCH@_la_LIBADD = -lltdl + + + bin_PROGRAMS = scim scim-config-agent +Index: scim-1.4.7/src/scim_module.cpp +=================================================================== +--- scim-1.4.7.orig/src/scim_module.cpp ++++ scim-1.4.7/src/scim_module.cpp +@@ -27,7 +27,9 @@ + #define Uses_STL_ALGORITHM + #include "scim_private.h" + #include "scim.h" +-#include "ltdl.h" ++extern "C" { ++ #include <ltdl.h> ++} + #include <dirent.h> + #include <sys/types.h> + #include <sys/stat.h> +Index: scim-1.4.7/configure.ac +=================================================================== +--- scim-1.4.7.orig/configure.ac ++++ scim-1.4.7/configure.ac +@@ -71,7 +71,6 @@ AM_GNU_GETTEXT + # Init libtool + AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL +-AC_LIB_LTDL + AC_SUBST(LIBTOOL_DEPS) + + # libtool option to control which symbols are exported ================================================================ Index: packages/scim/scim-1.4.8-fix-dlopen.patch diff -u /dev/null packages/scim/scim-1.4.8-fix-dlopen.patch:1.1 --- /dev/null Sat Jan 22 16:20:29 2011 +++ packages/scim/scim-1.4.8-fix-dlopen.patch Sat Jan 22 16:20:23 2011 @@ -0,0 +1,4843 @@ +diff -up scim-1.4.8/src/ltdl.cpp.fix-dlopen scim-1.4.8/src/ltdl.cpp +--- scim-1.4.8/src/ltdl.cpp.fix-dlopen 2008-11-02 14:42:40.000000000 +0800 ++++ scim-1.4.8/src/ltdl.cpp 2009-03-25 15:12:45.733010053 +0800 +@@ -1,4414 +0,0 @@ +-/* ltdl.c -- system independent dlopen wrapper +- Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +- Originally by Thomas Tanner <[email protected]> +- This file is part of GNU Libtool. +- +-This library is free software; you can redistribute it and/or +-modify it under the terms of the GNU Lesser General Public +-License as published by the Free Software Foundation; either +-version 2 of the License, or (at your option) any later version. +- +-As a special exception to the GNU Lesser General Public License, +-if you distribute this file as part of a program or library that +-is built using GNU libtool, you may include it under the same +-distribution terms that you use for the rest of that program. +- +-This library is distributed in the hope that it will be useful, +-but WITHOUT ANY WARRANTY; without even the implied warranty of +-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-Lesser General Public License for more details. +- +-You should have received a copy of the GNU Lesser General Public +-License along with this library; if not, write to the Free Software +-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +-02111-1307 USA +- +-*/ +- +-#if HAVE_CONFIG_H +-# include <config.h> +-#endif +- +-#if HAVE_UNISTD_H +-# include <unistd.h> +-#endif +- +-#if HAVE_STDIO_H +-# include <stdio.h> +-#endif +- +-/* Include the header defining malloc. On K&R C compilers, +- that's <malloc.h>, on ANSI C and ISO C compilers, that's <stdlib.h>. */ +-#if HAVE_STDLIB_H +-# include <stdlib.h> +-#else +-# if HAVE_MALLOC_H +-# include <malloc.h> +-# endif +-#endif +- +-#if HAVE_STRING_H +-# include <string.h> +-#else +-# if HAVE_STRINGS_H +-# include <strings.h> +-# endif +-#endif +- +-#if HAVE_CTYPE_H +-# include <ctype.h> +-#endif +- +-#if HAVE_MEMORY_H +-# include <memory.h> +-#endif +- +-#if HAVE_ERRNO_H +-# include <errno.h> +-#endif +- +- +-#ifndef __WINDOWS__ +-# ifdef __WIN32__ +-# define __WINDOWS__ +-# endif +-#endif +- +- +-#undef LT_USE_POSIX_DIRENT +-#ifdef HAVE_CLOSEDIR +-# ifdef HAVE_OPENDIR +-# ifdef HAVE_READDIR +-# ifdef HAVE_DIRENT_H +-# define LT_USE_POSIX_DIRENT +-# endif /* HAVE_DIRENT_H */ +-# endif /* HAVE_READDIR */ +-# endif /* HAVE_OPENDIR */ +-#endif /* HAVE_CLOSEDIR */ +- +- +-#undef LT_USE_WINDOWS_DIRENT_EMULATION +-#ifndef LT_USE_POSIX_DIRENT +-# ifdef __WINDOWS__ +-# define LT_USE_WINDOWS_DIRENT_EMULATION +-# endif /* __WINDOWS__ */ +-#endif /* LT_USE_POSIX_DIRENT */ +- +- +-#ifdef LT_USE_POSIX_DIRENT +-# include <dirent.h> +-# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name)) +-#else +-# ifdef LT_USE_WINDOWS_DIRENT_EMULATION +-# define LT_D_NAMLEN(dirent) (strlen((dirent)->d_name)) +-# else +-# define dirent direct +-# define LT_D_NAMLEN(dirent) ((dirent)->d_namlen) +-# if HAVE_SYS_NDIR_H +-# include <sys/ndir.h> +-# endif +-# if HAVE_SYS_DIR_H +-# include <sys/dir.h> +-# endif +-# if HAVE_NDIR_H +-# include <ndir.h> +-# endif +-# endif +-#endif +- +-#if HAVE_ARGZ_H +-# include <argz.h> +-#endif +- +-#if HAVE_ASSERT_H +-# include <assert.h> +-#else +-# define assert(arg) ((void) 0) +-#endif +- +-#include "ltdl.h" +- +-#if WITH_DMALLOC +-# include <dmalloc.h> +-#endif +- +- +- +- +-/* --- WINDOWS SUPPORT --- */ +- +- +-#ifdef DLL_EXPORT +-# define LT_GLOBAL_DATA __declspec(dllexport) +-#else +-# define LT_GLOBAL_DATA +-#endif +- +-/* fopen() mode flags for reading a text file */ +-#undef LT_READTEXT_MODE +-#ifdef __WINDOWS__ +-# define LT_READTEXT_MODE "rt" +-#else +-# define LT_READTEXT_MODE "r" +-#endif +- +-#ifdef LT_USE_WINDOWS_DIRENT_EMULATION +- +-#include <windows.h> +- +-#define dirent lt_dirent +-#define DIR lt_DIR +- +-struct dirent +-{ +- char d_name[2048]; +- int d_namlen; +-}; +- +-typedef struct _DIR +-{ +- HANDLE hSearch; +- WIN32_FIND_DATA Win32FindData; +- BOOL firsttime; +- struct dirent file_info; +-} DIR; +- +-#endif /* LT_USE_WINDOWS_DIRENT_EMULATION */ +- +-namespace scim { +- +- +-/* --- MANIFEST CONSTANTS --- */ +- +- +-/* Standard libltdl search path environment variable name */ +-#undef LTDL_SEARCHPATH_VAR +-#define LTDL_SEARCHPATH_VAR "LTDL_LIBRARY_PATH" +- +-/* Standard libtool archive file extension. */ +-#undef LTDL_ARCHIVE_EXT +-#define LTDL_ARCHIVE_EXT ".la" +- +-/* max. filename length */ +-#ifndef LT_FILENAME_MAX +-# define LT_FILENAME_MAX 1024 +-#endif +- +-/* This is the maximum symbol size that won't require malloc/free */ +-#undef LT_SYMBOL_LENGTH +-#define LT_SYMBOL_LENGTH 128 +- +-/* This accounts for the _LTX_ separator */ +-#undef LT_SYMBOL_OVERHEAD +-#define LT_SYMBOL_OVERHEAD 5 +- +- +- +- +-/* --- MEMORY HANDLING --- */ +- +- +-/* These are the functions used internally. In addition to making +- use of the associated function pointers above, they also perform +- error handling. */ +-static char *lt_estrdup LT_PARAMS((const char *str)); +-static lt_ptr lt_emalloc LT_PARAMS((size_t size)); +-static lt_ptr lt_erealloc LT_PARAMS((lt_ptr addr, size_t size)); +- +-/* static lt_ptr rpl_realloc LT_PARAMS((lt_ptr ptr, size_t size)); */ +-#define rpl_realloc realloc +- +-/* These are the pointers that can be changed by the caller: */ +-LT_GLOBAL_DATA lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size)) +- = (lt_ptr (*) LT_PARAMS((size_t))) malloc; +-LT_GLOBAL_DATA lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size)) +- = (lt_ptr (*) LT_PARAMS((lt_ptr, size_t))) rpl_realloc; +-LT_GLOBAL_DATA void (*lt_dlfree) LT_PARAMS((lt_ptr ptr)) +- = (void (*) LT_PARAMS((lt_ptr))) free; +- +-/* The following macros reduce the amount of typing needed to cast +- assigned memory. */ +-#if WITH_DMALLOC +- +-#define LT_DLMALLOC(tp, n) ((tp *) xmalloc ((n) * sizeof(tp))) +-#define LT_DLREALLOC(tp, p, n) ((tp *) xrealloc ((p), (n) * sizeof(tp))) +-#define LT_DLFREE(p) \ +- LT_STMT_START { if (p) { xfree (p); (p) = 0; } } LT_STMT_END +- +-#define LT_EMALLOC(tp, n) ((tp *) xmalloc ((n) * sizeof(tp))) +-#define LT_EREALLOC(tp, p, n) ((tp *) xrealloc ((p), (n) * sizeof(tp))) +- +-#else +- +-#define LT_DLMALLOC(tp, n) ((tp *) lt_dlmalloc ((n) * sizeof(tp))) +-#define LT_DLREALLOC(tp, p, n) ((tp *) lt_dlrealloc ((p), (n) * sizeof(tp))) +-#define LT_DLFREE(p) \ +- LT_STMT_START { if (p) { lt_dlfree (p); (p) = 0; } } LT_STMT_END +- +-#define LT_EMALLOC(tp, n) ((tp *) lt_emalloc ((n) * sizeof(tp))) +-#define LT_EREALLOC(tp, p, n) ((tp *) lt_erealloc ((p), (n) * sizeof(tp))) +- +-#endif +- +-#define LT_DLMEM_REASSIGN(p, q) LT_STMT_START { \ +- if ((p) != (q)) { if (p) lt_dlfree (p); (p) = (q); (q) = 0; } \ +- } LT_STMT_END +- +- +-/* --- REPLACEMENT FUNCTIONS --- */ +- +- +-#undef strdup +-#define strdup rpl_strdup +- +-static char *strdup LT_PARAMS((const char *str)); +- +-static char * +-strdup(const char *str) +-{ +- char *tmp = 0; +- +- if (str) +- { +- tmp = LT_DLMALLOC (char, 1+ strlen (str)); +- if (tmp) +- { +- strcpy(tmp, str); +- } +- } +- +- return tmp; +-} +- +- +-#if ! HAVE_STRCMP +- +-#undef strcmp +-#define strcmp rpl_strcmp +- +-static int strcmp LT_PARAMS((const char *str1, const char *str2)); +- +-static int +-strcmp (const char *str1, const char *str2) +-{ +- if (str1 == str2) +- return 0; +- if (str1 == 0) +- return -1; +- if (str2 == 0) +- return 1; +- +- for (;*str1 && *str2; ++str1, ++str2) +- { +- if (*str1 != *str2) +- break; +- } +- +- return (int)(*str1 - *str2); +-} +-#endif +- +- +-#if ! HAVE_STRCHR +- +-# if HAVE_INDEX +-# define strchr index +-# else +-# define strchr rpl_strchr +- +-static const char *strchr LT_PARAMS((const char *str, int ch)); +- +-static const char* +-strchr(const char *str, int ch) +-{ +- const char *p; +- +- for (p = str; *p != (char)ch && *p != LT_EOS_CHAR; ++p) +- /*NOWORK*/; +- +- return (*p == (char)ch) ? p : 0; +-} +- +-# endif +-#endif /* !HAVE_STRCHR */ +- +- +-#if ! HAVE_STRRCHR +- +-# if HAVE_RINDEX +-# define strrchr rindex +-# else +-# define strrchr rpl_strrchr +- +-static const char *strrchr LT_PARAMS((const char *str, int ch)); +- +-static const char* +-strrchr(const char *str, int ch) +-{ +- const char *p, *q = 0; +- +- for (p = str; *p != LT_EOS_CHAR; ++p) +- { +- if (*p == (char) ch) +- { +- q = p; +- } +- } +- +- return q; +-} +- +-# endif +-#endif +- +-/* NOTE: Neither bcopy nor the memcpy implementation below can +- reliably handle copying in overlapping areas of memory. Use +- memmove (for which there is a fallback implmentation below) +- if you need that behaviour. */ +-#if ! HAVE_MEMCPY +- +-# if HAVE_BCOPY +-# define memcpy(dest, src, size) bcopy (src, dest, size) +-# else +-# define memcpy rpl_memcpy +- +-static lt_ptr memcpy LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size)); +- +-static lt_ptr +-memcpy (lt_ptr dest, const lt_ptr src, size_t size) +-{ +- size_t i = 0; +- +- for (i = 0; i < size; ++i) +- { +- dest[i] = src[i]; +- } +- +- return dest; +-} +- +-# endif /* !HAVE_BCOPY */ +-#endif /* !HAVE_MEMCPY */ +- +-#if ! HAVE_MEMMOVE +-# define memmove rpl_memmove +- +-static lt_ptr memmove LT_PARAMS((lt_ptr dest, const lt_ptr src, size_t size)); +- +-static lt_ptr +-memmove (lt_ptr dest, const lt_ptr src, size_t size) +-{ +- size_t i; +- +- if (dest < src) +- for (i = 0; i < size; ++i) +- { +- dest[i] = src[i]; +- } +- else if (dest > src) +- for (i = size -1; i >= 0; --i) +- { +- dest[i] = src[i]; +- } +- +- return dest; +-} +- +-#endif /* !HAVE_MEMMOVE */ +- +-#ifdef LT_USE_WINDOWS_DIRENT_EMULATION +- +-static void closedir LT_PARAMS((DIR *entry)); +- +-static void +-closedir(DIR *entry) +-{ +- assert(entry != (DIR *) NULL); +- FindClose(entry->hSearch); +- lt_dlfree((lt_ptr)entry); +-} +- +- +-static DIR * opendir LT_PARAMS((const char *path)); +- +-static DIR* +-opendir (const char *path) +-{ +- char file_specification[LT_FILENAME_MAX]; +- DIR *entry; +- +- assert(path != (char *) NULL); +- (void) strncpy(file_specification,path,LT_FILENAME_MAX-1); +- (void) strcat(file_specification,"\\"); +- entry = LT_DLMALLOC (DIR,sizeof(DIR)); +- if (entry != (DIR *) 0) +- { +- entry->firsttime = TRUE; +- entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData); +- } +- if (entry->hSearch == INVALID_HANDLE_VALUE) +- { +- (void) strcat(file_specification,"\\*.*"); +- entry->hSearch = FindFirstFile(file_specification,&entry->Win32FindData); +- if (entry->hSearch == INVALID_HANDLE_VALUE) +- { +- LT_DLFREE (entry); +- return (DIR *) 0; +- } +- } +- return(entry); +-} <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scim/scim.spec?r1=1.6&r2=1.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
