guibuilder_pel7x64builder0
7 years ago
6 changed files with 2095 additions and 0 deletions
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,13 @@ |
|||||||
|
--- src/st_list.c.orig 2008-08-27 11:32:47.000000000 +1000 |
||||||
|
+++ src/st_list.c 2008-08-27 10:24:34.000000000 +1000 |
||||||
|
@@ -662,7 +662,9 @@ |
||||||
|
g_return_if_fail(b != NULL); |
||||||
|
|
||||||
|
mwString_get(b, &str); |
||||||
|
- list_get(str, l); |
||||||
|
- g_free(str); |
||||||
|
+ if (str) { |
||||||
|
+ list_get(str, l); |
||||||
|
+ g_free(str); |
||||||
|
+ } |
||||||
|
} |
||||||
@ -0,0 +1,21 @@ |
|||||||
|
# User Mikael Berthe <mikael.berthe@lilotux.net> |
||||||
|
# Date 1194544713 -3600 |
||||||
|
Fix file transfers with recent Sametime servers |
||||||
|
|
||||||
|
It seems that the last guint32_get() fails when Meanwhile receives |
||||||
|
the FT offer. |
||||||
|
I think we can skip it -- works for me but I can't check it with an |
||||||
|
older server. |
||||||
|
|
||||||
|
diff -r 4aabc56c0e5f src/srvc_ft.c |
||||||
|
--- a/src/srvc_ft.c Tue Nov 06 11:46:26 2007 +0100 |
||||||
|
+++ b/src/srvc_ft.c Thu Nov 08 18:58:33 2007 +0100 |
||||||
|
@@ -142,7 +142,7 @@ static void recv_channelCreate(struct mw |
||||||
|
mwString_get(b, &fnm); /* offered filename */ |
||||||
|
mwString_get(b, &txt); /* offering message */ |
||||||
|
guint32_get(b, &size); /* size of offered file */ |
||||||
|
- guint32_get(b, &junk); /* unknown */ |
||||||
|
+ /* guint32_get(b, &junk); */ /* unknown */ |
||||||
|
/* and we just skip an unknown guint16 at the end */ |
||||||
|
|
||||||
|
b_err = mwGetBuffer_error(b); |
||||||
@ -0,0 +1,279 @@ |
|||||||
|
Index: meanwhile-1.1.0/samples/logging_proxy.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/samples/logging_proxy.c |
||||||
|
+++ meanwhile-1.1.0/samples/logging_proxy.c |
||||||
|
@@ -25,7 +25,6 @@ |
||||||
|
#include <unistd.h> |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
|
||||||
|
#include <mw_cipher.h> |
||||||
|
#include <mw_common.h> |
||||||
|
Index: meanwhile-1.1.0/samples/login_server.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/samples/login_server.c |
||||||
|
+++ meanwhile-1.1.0/samples/login_server.c |
||||||
|
@@ -19,7 +19,6 @@ |
||||||
|
#include <unistd.h> |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
|
||||||
|
#include <mw_cipher.h> |
||||||
|
#include <mw_common.h> |
||||||
|
Index: meanwhile-1.1.0/samples/nocipher_proxy.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/samples/nocipher_proxy.c |
||||||
|
+++ meanwhile-1.1.0/samples/nocipher_proxy.c |
||||||
|
@@ -29,7 +29,6 @@ |
||||||
|
#include <unistd.h> |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
|
||||||
|
#include <mw_common.h> |
||||||
|
#include <mw_message.h> |
||||||
|
Index: meanwhile-1.1.0/samples/redirect_server.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/samples/redirect_server.c |
||||||
|
+++ meanwhile-1.1.0/samples/redirect_server.c |
||||||
|
@@ -22,7 +22,6 @@ |
||||||
|
#include <unistd.h> |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
|
||||||
|
#include <mw_common.h> |
||||||
|
#include <mw_message.h> |
||||||
|
Index: meanwhile-1.1.0/src/channel.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/channel.c |
||||||
|
+++ meanwhile-1.1.0/src/channel.c |
||||||
|
@@ -19,8 +19,6 @@ |
||||||
|
*/ |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/ghash.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
#include <string.h> |
||||||
|
|
||||||
|
#include "mw_channel.h" |
||||||
|
Index: meanwhile-1.1.0/src/mw_debug.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/mw_debug.c |
||||||
|
+++ meanwhile-1.1.0/src/mw_debug.c |
||||||
|
@@ -19,7 +19,7 @@ |
||||||
|
*/ |
||||||
|
|
||||||
|
|
||||||
|
-#include <glib/gstring.h> |
||||||
|
+#include <glib.h> |
||||||
|
|
||||||
|
#include "mw_debug.h" |
||||||
|
|
||||||
|
Index: meanwhile-1.1.0/src/mw_message.h |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/mw_message.h |
||||||
|
+++ meanwhile-1.1.0/src/mw_message.h |
||||||
|
@@ -22,7 +22,7 @@ |
||||||
|
#define _MW_MESSAGE_H |
||||||
|
|
||||||
|
|
||||||
|
-#include <glib/glist.h> |
||||||
|
+#include <glib.h> |
||||||
|
#include "mw_common.h" |
||||||
|
|
||||||
|
|
||||||
|
Index: meanwhile-1.1.0/src/mw_srvc_conf.h |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/mw_srvc_conf.h |
||||||
|
+++ meanwhile-1.1.0/src/mw_srvc_conf.h |
||||||
|
@@ -22,7 +22,7 @@ |
||||||
|
#define _MW_SRVC_CONF_H |
||||||
|
|
||||||
|
|
||||||
|
-#include <glib/glist.h> |
||||||
|
+#include <glib.h> |
||||||
|
#include "mw_common.h" |
||||||
|
|
||||||
|
|
||||||
|
Index: meanwhile-1.1.0/src/mw_srvc_dir.h |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/mw_srvc_dir.h |
||||||
|
+++ meanwhile-1.1.0/src/mw_srvc_dir.h |
||||||
|
@@ -22,7 +22,6 @@ |
||||||
|
|
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus |
||||||
|
Index: meanwhile-1.1.0/src/mw_srvc_place.h |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/mw_srvc_place.h |
||||||
|
+++ meanwhile-1.1.0/src/mw_srvc_place.h |
||||||
|
@@ -22,7 +22,7 @@ |
||||||
|
#define _MW_SRVC_PLACE_H |
||||||
|
|
||||||
|
|
||||||
|
-#include <glib/glist.h> |
||||||
|
+#include <glib.h> |
||||||
|
#include "mw_common.h" |
||||||
|
|
||||||
|
|
||||||
|
Index: meanwhile-1.1.0/src/mw_srvc_resolve.h |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/mw_srvc_resolve.h |
||||||
|
+++ meanwhile-1.1.0/src/mw_srvc_resolve.h |
||||||
|
@@ -23,7 +23,6 @@ |
||||||
|
|
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus |
||||||
|
Index: meanwhile-1.1.0/src/mw_st_list.h |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/mw_st_list.h |
||||||
|
+++ meanwhile-1.1.0/src/mw_st_list.h |
||||||
|
@@ -30,7 +30,6 @@ |
||||||
|
|
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
#include "mw_common.h" |
||||||
|
|
||||||
|
|
||||||
|
Index: meanwhile-1.1.0/src/mw_util.h |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/mw_util.h |
||||||
|
+++ meanwhile-1.1.0/src/mw_util.h |
||||||
|
@@ -23,9 +23,6 @@ |
||||||
|
|
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/ghash.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
- |
||||||
|
|
||||||
|
#define map_guint_new() \ |
||||||
|
g_hash_table_new(g_direct_hash, g_direct_equal) |
||||||
|
Index: meanwhile-1.1.0/src/srvc_aware.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/srvc_aware.c |
||||||
|
+++ meanwhile-1.1.0/src/srvc_aware.c |
||||||
|
@@ -19,8 +19,6 @@ |
||||||
|
*/ |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/ghash.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
#include <string.h> |
||||||
|
|
||||||
|
#include "mw_channel.h" |
||||||
|
Index: meanwhile-1.1.0/src/srvc_conf.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/srvc_conf.c |
||||||
|
+++ meanwhile-1.1.0/src/srvc_conf.c |
||||||
|
@@ -19,8 +19,6 @@ |
||||||
|
*/ |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/ghash.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
|
||||||
|
#include <stdio.h> |
||||||
|
#include <stdlib.h> |
||||||
|
Index: meanwhile-1.1.0/src/srvc_dir.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/srvc_dir.c |
||||||
|
+++ meanwhile-1.1.0/src/srvc_dir.c |
||||||
|
@@ -18,7 +18,7 @@ |
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
||||||
|
*/ |
||||||
|
|
||||||
|
-#include <glib/ghash.h> |
||||||
|
+#include <glib.h> |
||||||
|
|
||||||
|
#include "mw_channel.h" |
||||||
|
#include "mw_common.h" |
||||||
|
Index: meanwhile-1.1.0/src/srvc_ft.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/srvc_ft.c |
||||||
|
+++ meanwhile-1.1.0/src/srvc_ft.c |
||||||
|
@@ -19,7 +19,7 @@ |
||||||
|
*/ |
||||||
|
|
||||||
|
|
||||||
|
-#include <glib/glist.h> |
||||||
|
+#include <glib.h> |
||||||
|
|
||||||
|
#include "mw_channel.h" |
||||||
|
#include "mw_common.h" |
||||||
|
Index: meanwhile-1.1.0/src/srvc_im.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/srvc_im.c |
||||||
|
+++ meanwhile-1.1.0/src/srvc_im.c |
||||||
|
@@ -19,7 +19,6 @@ |
||||||
|
*/ |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
#include <string.h> |
||||||
|
|
||||||
|
#include "mw_channel.h" |
||||||
|
Index: meanwhile-1.1.0/src/srvc_place.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/srvc_place.c |
||||||
|
+++ meanwhile-1.1.0/src/srvc_place.c |
||||||
|
@@ -19,8 +19,6 @@ |
||||||
|
*/ |
||||||
|
|
||||||
|
#include <glib.h> |
||||||
|
-#include <glib/ghash.h> |
||||||
|
-#include <glib/glist.h> |
||||||
|
|
||||||
|
#include <stdio.h> |
||||||
|
#include <stdlib.h> |
||||||
|
Index: meanwhile-1.1.0/src/srvc_resolve.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/srvc_resolve.c |
||||||
|
+++ meanwhile-1.1.0/src/srvc_resolve.c |
||||||
|
@@ -18,7 +18,7 @@ |
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
||||||
|
*/ |
||||||
|
|
||||||
|
-#include <glib/ghash.h> |
||||||
|
+#include <glib.h> |
||||||
|
|
||||||
|
#include "mw_channel.h" |
||||||
|
#include "mw_common.h" |
||||||
|
Index: meanwhile-1.1.0/src/srvc_store.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/srvc_store.c |
||||||
|
+++ meanwhile-1.1.0/src/srvc_store.c |
||||||
|
@@ -18,7 +18,7 @@ |
||||||
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
||||||
|
*/ |
||||||
|
|
||||||
|
-#include <glib/glist.h> |
||||||
|
+#include <glib.h> |
||||||
|
|
||||||
|
#include "mw_channel.h" |
||||||
|
#include "mw_debug.h" |
||||||
|
Index: meanwhile-1.1.0/src/st_list.c |
||||||
|
=================================================================== |
||||||
|
--- meanwhile-1.1.0.orig/src/st_list.c |
||||||
|
+++ meanwhile-1.1.0/src/st_list.c |
||||||
|
@@ -20,7 +20,7 @@ |
||||||
|
|
||||||
|
#include <stdio.h> |
||||||
|
#include <string.h> |
||||||
|
-#include <glib/gstring.h> |
||||||
|
+#include <glib.h> |
||||||
|
|
||||||
|
#include "mw_debug.h" |
||||||
|
#include "mw_util.h" |
||||||
@ -0,0 +1,21 @@ |
|||||||
|
# User Mikael Berthe <mikael.berthe@lilotux.net> |
||||||
|
# Date 1195749751 -3600 |
||||||
|
Fix Awareness status timestamps with recent Sametime clients |
||||||
|
|
||||||
|
For some reason the status timestamps I receive from people with a recent |
||||||
|
Sametime client make no sense. This patch simply sets the timestamp to 0, |
||||||
|
as I have no idea how to interpret these time values. |
||||||
|
|
||||||
|
diff -r 17977a4e7da1 -r e7601af90b31 src/common.c |
||||||
|
--- a/src/common.c Thu Nov 08 18:58:33 2007 +0100 |
||||||
|
+++ b/src/common.c Thu Nov 22 17:42:31 2007 +0100 |
||||||
|
@@ -688,6 +688,9 @@ void mwUserStatus_get(struct mwGetBuffer |
||||||
|
guint16_get(b, &stat->status); |
||||||
|
guint32_get(b, &stat->time); |
||||||
|
mwString_get(b, &stat->desc); |
||||||
|
+ |
||||||
|
+ // Quick'n ugly hack for recent Sametime clients |
||||||
|
+ stat->time = 0; |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,128 @@ |
|||||||
|
Name: meanwhile |
||||||
|
Version: 1.1.0 |
||||||
|
Release: 12%{?dist} |
||||||
|
Summary: Lotus Sametime Community Client library |
||||||
|
License: LGPLv2+ |
||||||
|
URL: http://%{name}.sourceforge.net |
||||||
|
|
||||||
|
# The source for this package was pulled from upstream's vcs. Use the following |
||||||
|
# commands to generate the tarball: |
||||||
|
# cvs -d:pserver:anonymous@%{name}.cvs.sourceforge.net:/cvsroot/%{name} login |
||||||
|
# [hit return for the password] |
||||||
|
# cvs -d:pserver:anonymous@%{name}.cvs.sourceforge.net:/cvsroot/%{name} co -d %{name}-1.1.0 -r %{name}_v1_1_0 %{name} |
||||||
|
# cd %{name}-1.1.0 |
||||||
|
# ./autogen.sh |
||||||
|
# make dist |
||||||
|
Source: %{name}-%{version}.tar.gz |
||||||
|
Patch0: %{name}-crash.patch |
||||||
|
Patch1: %{name}-fix-glib-headers.patch |
||||||
|
Patch2: %{name}-file-transfer.patch |
||||||
|
Patch3: %{name}-status-timestamp-workaround.patch |
||||||
|
Patch4: %{name}-aarch64.patch |
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) |
||||||
|
|
||||||
|
BuildRequires: glib2-devel |
||||||
|
BuildRequires: doxygen |
||||||
|
|
||||||
|
%description |
||||||
|
The heart of the %{name} Project is the %{name} library, providing the basic |
||||||
|
Lotus Sametime session functionality along with the core services; Presence |
||||||
|
Awareness, Instant Messaging, Multi-user Conferencing, Preferences Storage, |
||||||
|
Identity Resolution, and File Transfer. |
||||||
|
|
||||||
|
%package devel |
||||||
|
Summary: Header files, libraries and development documentation for %{name} |
||||||
|
Requires: %{name}%{?_isa} = %{version}-%{release} |
||||||
|
Requires: glib2-devel |
||||||
|
|
||||||
|
%description devel |
||||||
|
This package contains the header files, static libraries and development |
||||||
|
documentation for %{name}. If you like to develop programs using %{name}, you |
||||||
|
will need to install %{name}-devel. |
||||||
|
|
||||||
|
%package doc |
||||||
|
Summary: Documentation for the %{name} library |
||||||
|
License: GFDL |
||||||
|
|
||||||
|
%description doc |
||||||
|
Documentation for the %{name} library. |
||||||
|
|
||||||
|
%prep |
||||||
|
%setup -q |
||||||
|
%patch0 -p0 -b .crash |
||||||
|
%patch1 -p1 -b .fix-glib-headers |
||||||
|
%patch2 -p1 -b .file-transfer |
||||||
|
%patch3 -p1 -b .status-timestamp-workaround |
||||||
|
%patch4 -p1 -b .aarch64 |
||||||
|
|
||||||
|
%build |
||||||
|
%configure --enable-doxygen |
||||||
|
make %{?_smp_mflags} |
||||||
|
|
||||||
|
%install |
||||||
|
rm -rf %{buildroot} |
||||||
|
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" |
||||||
|
# Remove the latex documentation. Nobody reads it, it installs a font for |
||||||
|
# some unknown reason, and people have to build it themselves. Dumb. |
||||||
|
rm -rf %{buildroot}%{_datadir}/doc/%{name}-doc-%{version}/latex \ |
||||||
|
%{buildroot}%{_libdir}/lib%{name}.a \ |
||||||
|
%{buildroot}%{_libdir}/lib%{name}.la |
||||||
|
|
||||||
|
%post -p /sbin/ldconfig |
||||||
|
|
||||||
|
%postun -p /sbin/ldconfig |
||||||
|
|
||||||
|
%files |
||||||
|
%doc AUTHORS ChangeLog COPYING README TODO LICENSE NEWS |
||||||
|
%{_libdir}/lib%{name}.so.* |
||||||
|
|
||||||
|
%files devel |
||||||
|
%{_includedir}/%{name}/ |
||||||
|
%{_libdir}/lib%{name}.so |
||||||
|
%{_libdir}/pkgconfig/%{name}.pc |
||||||
|
|
||||||
|
%files doc |
||||||
|
%{_datadir}/doc/%{name}-doc-%{version}/ |
||||||
|
|
||||||
|
%changelog |
||||||
|
* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 1.1.0-12 |
||||||
|
- Mass rebuild 2014-01-24 |
||||||
|
|
||||||
|
* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.1.0-11 |
||||||
|
- Mass rebuild 2013-12-27 |
||||||
|
|
||||||
|
* Tue Mar 26 2013 Simone Caronni <negativo17@gmail.com> - 1.1.0-10 |
||||||
|
- Added aarch64 patch. |
||||||
|
|
||||||
|
* Tue Mar 26 2013 Simone Caronni <negativo17@gmail.com> - 1.1.0-9 |
||||||
|
- Added patches for file transfer and status time workaround: |
||||||
|
http://www.lilotux.net/~mikael/pub/meanwhile/ |
||||||
|
- Spec file formatting. |
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-8 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild |
||||||
|
|
||||||
|
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-7 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-6 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Nov 18 2011 Josh Boyer <jwboyer@gmail.com> 1.1.0-5 |
||||||
|
- Fix glib.h build issues (rhbz 750023) |
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-5 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Jan 29 2010 Josh Boyer <jwboyer@gmail.com> - 1.1.0-4 |
||||||
|
- Remove lib%{name}.a (#556084) |
||||||
|
|
||||||
|
* Tue Jan 12 2010 Dan Winship <danw@redhat.com> - 1.1.0-3 |
||||||
|
- Fix Source tag to indicate a CVS snapshot build. |
||||||
|
- Resolves: #554446 |
||||||
|
|
||||||
|
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-2 |
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild |
||||||
|
|
||||||
|
* Fri Mar 13 2009 Josh Boyer <jwboyer@gmail.com> - 1.1.0-1 |
||||||
|
- Update to %{name}_v1_1_0 branch from upstream CVS. Fixes bug 490088 |
||||||
Loading…
Reference in new issue