rpms/ekg2/devel ekg2-gcc43.patch, 1.3, 1.4 ekg2-rpm.patch, 1.4, 1.5 ekg2.spec, 1.14, 1.15
Dominik Mierzejewski (rathann)
fedora-extras-commits at redhat.com
Wed Jun 4 09:05:38 UTC 2008
Author: rathann
Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6250
Modified Files:
ekg2-gcc43.patch ekg2-rpm.patch ekg2.spec
Log Message:
- fix No UI-PLUGIN problem (patch from upstream)
ekg2-gcc43.patch:
Index: ekg2-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2-gcc43.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ekg2-gcc43.patch 28 May 2008 20:36:53 -0000 1.3
+++ ekg2-gcc43.patch 4 Jun 2008 09:04:49 -0000 1.4
@@ -1,6 +1,90 @@
-diff -up ekg2-0.2-rc1/ekg/resolver.c.g ekg2-0.2-rc1/ekg/resolver.c
---- ekg2-0.2-rc1/ekg/resolver.c.g 2008-02-28 21:23:03.000000000 +0100
-+++ ekg2-0.2-rc1/ekg/resolver.c 2008-05-28 22:18:26.000000000 +0200
+diff -up ekg2-0.2-rc1/ekg/strings.c.gcc43 ekg2-0.2-rc1/ekg/strings.c
+--- ekg2-0.2-rc1/ekg/strings.c.gcc43 2008-02-28 21:23:03.000000000 +0100
++++ ekg2-0.2-rc1/ekg/strings.c 2008-06-04 10:55:10.000000000 +0200
+@@ -43,36 +43,36 @@
+ /* stringo-naprawiacz, taki jak ufix() w xmalloc */
+ #define ufix(x) ((wchar_t *) x ? (wchar_t *) x : (wchar_t *) L"")
+
+-inline int xwcslen(const CHAR_T *str) {
++int xwcslen(const CHAR_T *str) {
+ return wcslen(ufix(str));
+ }
+
+-inline int xmbslen(const char *str) {
++int xmbslen(const char *str) {
+ return mbstowcs(NULL, str ? str : "", 0);
+ }
+
+-inline CHAR_T *xwcscpy(CHAR_T *dst, CHAR_T *src) {
++CHAR_T *xwcscpy(CHAR_T *dst, CHAR_T *src) {
+ return wcscpy(ufix(dst), ufix(src));
+ }
+
+-inline CHAR_T *xwcsdup(CHAR_T *str) {
++CHAR_T *xwcsdup(CHAR_T *str) {
+ if (!str) return NULL;
+ return xmemdup(str, (xwcslen(str)+1) * sizeof(CHAR_T));
+ }
+
+-inline CHAR_T *xwcscat(CHAR_T *dst, const CHAR_T *src) {
++CHAR_T *xwcscat(CHAR_T *dst, const CHAR_T *src) {
+ return wcscat(ufix(dst), ufix(src));
+ }
+
+-inline int xwcscmp(const CHAR_T *s1, const CHAR_T *s2) {
++int xwcscmp(const CHAR_T *s1, const CHAR_T *s2) {
+ return wcscmp(ufix(s1), ufix(s2));
+ }
+
+-inline CHAR_T *xwcschr(const CHAR_T *s, CHAR_T c) {
++CHAR_T *xwcschr(const CHAR_T *s, CHAR_T c) {
+ return wcschr(ufix(s), c);
+ }
+
+-inline char *wcs_to_normal(const CHAR_T *str) {
++char *wcs_to_normal(const CHAR_T *str) {
+ if (!str) return NULL;
+ {
+ int len = wcstombs(NULL, str,0);
+@@ -85,7 +85,7 @@ inline char *wcs_to_normal(const CHAR_T
+ }
+ }
+
+-inline CHAR_T *normal_to_wcs(const char *str) {
++CHAR_T *normal_to_wcs(const char *str) {
+ if (!str) return NULL;
+ {
+ int len = xmbslen(str)+1;
+@@ -95,7 +95,7 @@ inline CHAR_T *normal_to_wcs(const char
+ }
+ }
+
+-inline CHAR_T **wcs_array_make(const CHAR_T *string, const CHAR_T *sep, int max, int trim, int quotes) {
++CHAR_T **wcs_array_make(const CHAR_T *string, const CHAR_T *sep, int max, int trim, int quotes) {
+ char *str = wcs_to_normal(string);
+ char *sp = wcs_to_normal(sep);
+ char **arr, **tmp;
+@@ -115,7 +115,7 @@ inline CHAR_T **wcs_array_make(const CHA
+ return newarr;
+ }
+
+-inline size_t xwcslcpy(CHAR_T *dst, const CHAR_T *src, size_t size) {
++size_t xwcslcpy(CHAR_T *dst, const CHAR_T *src, size_t size) {
+ /* copied from strlcpy.c (c Piotr Domagalski) */
+ register size_t i, n = size;
+
+@@ -131,7 +131,7 @@ inline size_t xwcslcpy(CHAR_T *dst, cons
+ return i;
+ }
+
+-inline CHAR_T *wcs_array_join(CHAR_T **array, const CHAR_T *sep) {
++CHAR_T *wcs_array_join(CHAR_T **array, const CHAR_T *sep) {
+ char **arr;
+ char *sp = wcs_to_normal(sep);
+ char *tmp;
+diff -up ekg2-0.2-rc1/ekg/resolver.c.gcc43 ekg2-0.2-rc1/ekg/resolver.c
+--- ekg2-0.2-rc1/ekg/resolver.c.gcc43 2008-02-28 21:23:03.000000000 +0100
++++ ekg2-0.2-rc1/ekg/resolver.c 2008-06-04 10:50:00.000000000 +0200
@@ -125,7 +125,7 @@ watch_t *ekg_resolver2(plugin_t *plugin,
if (!he)
a.s_addr = INADDR_NONE;
@@ -10,9 +94,43 @@
}
write(fd[1], &a, sizeof(a));
xfree(myserver);
-diff -up ekg2-0.2-rc1/plugins/jabber/Makefile.am.g ekg2-0.2-rc1/plugins/jabber/Makefile.am
---- ekg2-0.2-rc1/plugins/jabber/Makefile.am.g 2008-02-28 21:22:56.000000000 +0100
-+++ ekg2-0.2-rc1/plugins/jabber/Makefile.am 2008-05-28 22:13:35.000000000 +0200
+diff -up ekg2-0.2-rc1/ekg/strings.h.gcc43 ekg2-0.2-rc1/ekg/strings.h
+--- ekg2-0.2-rc1/ekg/strings.h.gcc43 2008-02-28 21:23:03.000000000 +0100
++++ ekg2-0.2-rc1/ekg/strings.h 2008-06-04 10:55:37.000000000 +0200
+@@ -36,18 +36,18 @@ extern int config_use_unicode; /* not ev
+ #define STRING_FORMAT "%ls"
+ #define CHAR_FORMAT "%lc"
+
+-inline int xwcslen(const CHAR_T *str);
+-inline int xmbslen(const char *str);
+-inline CHAR_T *xwcscpy(CHAR_T *dst, CHAR_T *src);
+-inline CHAR_T *xwcsdup(CHAR_T *str);
+-inline CHAR_T *xwcscat(CHAR_T *dst, const CHAR_T *src);
+-inline int xwcscmp(const CHAR_T *s1, const CHAR_T *s2);
+-inline CHAR_T *xwcschr(const CHAR_T *s, CHAR_T c);
+-inline char *wcs_to_normal(const CHAR_T *str);
+-inline CHAR_T *normal_to_wcs(const char *str);
+-inline CHAR_T **wcs_array_make(const CHAR_T *string, const CHAR_T *sep, int max, int trim, int quotes);
+-inline CHAR_T *wcs_array_join(CHAR_T **array, const CHAR_T *sep);
+-inline size_t xwcslcpy(CHAR_T *dst, const CHAR_T *src, size_t size);
++int xwcslen(const CHAR_T *str);
++int xmbslen(const char *str);
++CHAR_T *xwcscpy(CHAR_T *dst, CHAR_T *src);
++CHAR_T *xwcsdup(CHAR_T *str);
++CHAR_T *xwcscat(CHAR_T *dst, const CHAR_T *src);
++int xwcscmp(const CHAR_T *s1, const CHAR_T *s2);
++CHAR_T *xwcschr(const CHAR_T *s, CHAR_T c);
++char *wcs_to_normal(const CHAR_T *str);
++CHAR_T *normal_to_wcs(const char *str);
++CHAR_T **wcs_array_make(const CHAR_T *string, const CHAR_T *sep, int max, int trim, int quotes);
++CHAR_T *wcs_array_join(CHAR_T **array, const CHAR_T *sep);
++size_t xwcslcpy(CHAR_T *dst, const CHAR_T *src, size_t size);
+
+ #define free_utf(x) xfree(x)
+
+diff -up ekg2-0.2-rc1/plugins/jabber/Makefile.am.gcc43 ekg2-0.2-rc1/plugins/jabber/Makefile.am
+--- ekg2-0.2-rc1/plugins/jabber/Makefile.am.gcc43 2008-02-28 21:22:56.000000000 +0100
++++ ekg2-0.2-rc1/plugins/jabber/Makefile.am 2008-06-04 10:50:00.000000000 +0200
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = jabber.la
jabber_la_SOURCES = jabber.c commands.c misc.c digest.c xmlnode.c jabber_dcc.c jabber_handlers.c jabber.h jabber_dcc.h jabber-ssl.h
jabber_la_LDFLAGS = -module -avoid-version
@@ -22,9 +140,9 @@
libdir = $(plugindir)
-diff -up ekg2-0.2-rc1/plugins/feed/Makefile.am.g ekg2-0.2-rc1/plugins/feed/Makefile.am
---- ekg2-0.2-rc1/plugins/feed/Makefile.am.g 2008-02-28 21:23:00.000000000 +0100
-+++ ekg2-0.2-rc1/plugins/feed/Makefile.am 2008-05-28 22:14:10.000000000 +0200
+diff -up ekg2-0.2-rc1/plugins/feed/Makefile.am.gcc43 ekg2-0.2-rc1/plugins/feed/Makefile.am
+--- ekg2-0.2-rc1/plugins/feed/Makefile.am.gcc43 2008-02-28 21:23:00.000000000 +0100
++++ ekg2-0.2-rc1/plugins/feed/Makefile.am 2008-06-04 10:50:00.000000000 +0200
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = feed.la
feed_la_SOURCES = feed.c feed.h rss.c nntp.c
feed_la_LDFLAGS = -module -avoid-version
ekg2-rpm.patch:
Index: ekg2-rpm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2-rpm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ekg2-rpm.patch 28 May 2008 20:46:03 -0000 1.4
+++ ekg2-rpm.patch 4 Jun 2008 09:04:49 -0000 1.5
@@ -22,17 +22,6 @@
install-data-am:
mkdir -p $(DESTDIR)$(pkgdatadir)/plugins/ioctld/
-diff -up ekg2-0.2-rc1/plugins/ncurses/Makefile.am.r ekg2-0.2-rc1/plugins/ncurses/Makefile.am
---- ekg2-0.2-rc1/plugins/ncurses/Makefile.am.r 2008-02-28 21:22:53.000000000 +0100
-+++ ekg2-0.2-rc1/plugins/ncurses/Makefile.am 2008-05-28 20:19:20.000000000 +0200
-@@ -9,6 +9,7 @@ ncurses_la_CPPFLAGS = $(C_FVISIBILITY) $
-
- libdir = $(plugindir)
- INCLUDES = -DDATADIR=\"$(datadir)/ekg\"
-+AM_CFLAGS = -fno-strict-aliasing
-
- install-data-am:
- mkdir -p $(DESTDIR)$(pkgdatadir)/plugins/ncurses/
diff -up ekg2-0.2-rc1/docs/ekg2book/sheet.xsl.r ekg2-0.2-rc1/docs/ekg2book/sheet.xsl
--- ekg2-0.2-rc1/docs/ekg2book/sheet.xsl.r 2008-02-28 21:23:01.000000000 +0100
+++ ekg2-0.2-rc1/docs/ekg2book/sheet.xsl 2008-05-28 20:19:20.000000000 +0200
Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ekg2.spec 30 May 2008 09:15:10 -0000 1.14
+++ ekg2.spec 4 Jun 2008 09:04:49 -0000 1.15
@@ -5,7 +5,7 @@
Summary(pl): Wieloprotokołowy komunikator internetowy
Name: ekg2
Version: 0.2
-Release: 0.1.rc1%{?dist}
+Release: 0.2.rc1%{?dist}
License: GPLv2
Group: Applications/Internet
Source0: http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
@@ -354,6 +354,9 @@
%attr(755,root,root) %{perl_vendorarch}/auto/Ekg2/Irc/Irc.so
%changelog
+* Wed Jun 04 2008 Dominik Mierzejewski <rpm at greysector.net> 0.2-0.2.rc1
+- fix No UI-PLUGIN problem (patch from upstream)
+
* Wed May 28 2008 Dominik Mierzejewski <rpm at greysector.net> 0.2-0.1.rc1
- updated to 0.2-rc1 (#435369)
- fixed multiarch conflicts (#341051)
More information about the fedora-extras-commits
mailing list