Hello community,
here is the log from the commit of package licq
checked in at Wed Jul 12 12:15:27 CEST 2006.
--------
--- KDE/licq/licq.changes 2006-05-30 07:21:23.000000000 +0200
+++ licq/licq.changes 2006-07-12 11:06:16.000000000 +0200
@@ -1,0 +2,34 @@
+Wed Jul 12 11:04:29 CEST 2006 - lmichnovic@suse.cz
+
+- filled in description and Author for icqnd subpackage
+
+-------------------------------------------------------------------
+Tue Jul 11 18:06:37 CEST 2006 - lmichnovic@suse.cz
+
+- incorect lib dir and wrong pointer type punning on 64bit archs regarding
+ only icqnd plugin fixed in icqnd-0.1.9.5-cast_on_64bit.patch
+
+-------------------------------------------------------------------
+Tue Jul 11 12:11:54 CEST 2006 - lmichnovic@suse.cz
+
+- update to svn version to date 20060711
+ - fixes uninitialized variable [#190016]
+ - URL can contain '#' fix
+- adjusted patches: config-fix and emoticons due to changes in
+ Makefile for qt, msn and console plugins
+- due to change of creating desktop file in Makefile also for KDE
+ into kde dir, patch two_desktop_files fixes this duplication
+- added icqnd gtk2 plugin version 0.1.9.5 and building as subpackage
+ this plugin needs gtk2-devel in BuildRequires
+
+-------------------------------------------------------------------
+Tue Jun 6 14:54:24 CEST 2006 - lmichnovic@suse.cz
+
+- upgrade to uptodate svn version,
+ obsoletes unicode.patch and user_picture.patch
+- updated regexp for URL in emoticons.patch because URL can
+ contain '#'
+- removed xosd-devel and gtk-devel from BuildRequires
+ (xosd plugin is not maintened any more)
+
+-------------------------------------------------------------------
Old:
----
licq-20060522-bool.patch
licq-20060522-datetime.patch
licq-20060522-declaration.patch
licq-20060522-emoticons.patch
licq-20060522-nostrip.patch
licq-20060522-unicode.patch
licq-20060522-user_picture.patch
licq-20060522-userinfodlg.patch
licq-20060522-viewurl.patch
licq-20060522.tar.bz2
New:
----
icqnd-0.1.9.5-cast_on_64bit.patch
icqnd-0.1.9.5.tar.bz2
licq-20060711-bool.patch
licq-20060711-datetime.patch
licq-20060711-declaration.patch
licq-20060711-emoticons.patch
licq-20060711-nostrip.patch
licq-20060711-two_desktop_files.patch
licq-20060711-userinfodlg.patch
licq-20060711-viewurl.patch
licq-20060711.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ licq.spec ++++++
--- /var/tmp/diff_new_pack.PiEvrk/_old 2006-07-12 12:14:48.000000000 +0200
+++ /var/tmp/diff_new_pack.PiEvrk/_new 2006-07-12 12:14:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package licq (Version 20060522)
+# spec file for package licq (Version 20060711)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
# norootforbuild
Name: licq
-BuildRequires: cdk-devel gtk-devel kdelibs3-devel qt3-devel-tools xosd-devel
+BuildRequires: cdk-devel gtk2-devel kdelibs3-devel qt3-devel-tools
%if %suse_version > 1000
BuildRequires: gpgme-devel
%else
@@ -20,10 +20,11 @@
License: GPL
Group: Productivity/Networking/ICQ
Autoreqprov: on
-Version: 20060522
-Release: 3
+Version: 20060711
+Release: 1
Summary: Linux ICQ Client
-Source: %{name}-20060522.tar.bz2
+Source: %{name}-20060711.tar.bz2
+Source1: icqnd-0.1.9.5.tar.bz2
Patch1: %{name}-config-fix.patch
Patch2: %{name}-assert.patch
Patch3: %{name}-%{version}-bool.patch
@@ -32,9 +33,9 @@
Patch6: %{name}-%{version}-datetime.patch
Patch7: %{name}-%{version}-userinfodlg.patch
Patch8: %{name}-%{version}-viewurl.patch
-Patch9: %{name}-%{version}-user_picture.patch
-Patch10: %{name}-%{version}-unicode.patch
-Patch11: %{name}-%{version}-emoticons.patch
+Patch9: %{name}-%{version}-emoticons.patch
+Patch10: licq-20060711-two_desktop_files.patch
+Patch20: icqnd-0.1.9.5-cast_on_64bit.patch
URL: http://www.licq.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -51,8 +52,29 @@
+%package icqnd
+Summary: GTK-2 GUI plugin for Licq
+Group: Productivity/Networking/ICQ
+Requires: licq
+
+%description icqnd
+icqnd is a GTK-2 GUI for the popular ICQ program Licq. It's written in
+C++ and uses GTK/GLib. It features a clean, intuitive interface, the
+GTK-2 look&feel and all the licq IM backend supports (messages, chat,
+file transfers, history, search, ...) You can use this plugin instead
+of qt-gui if you prefer GNOME instead of KDE. After install of this
+plugin you have to choose it as default in Licq options.
+
+
+
+Authors:
+--------
+ Joachim Staib
+
%prep
-%setup -n licq-20060522
+%setup -a1
+# move icqnd source into plugins where it belongs
+mv icqnd-0.1.9.5 plugins
%patch1
%patch2 -p1
%patch3
@@ -63,7 +85,8 @@
%patch8
%patch9
%patch10
-%patch11
+#patches for icqnd
+%patch20
%build
%if %suse_version > 1001
@@ -98,6 +121,18 @@
--libdir=%{_libdir}/licq \
--mandir=%{_mandir}
make %{?jobs:-j%jobs}
+### not ready yet, the code is too buggy
+cd ../icqnd-0.1.9.5
+ aclocal
+ automake
+ autoconf
+ ./configure\
+ --prefix=%{_prefix} \
+ --libdir=%{_libdir}/licq \
+ --mandir=%{_mandir} \
+ --with-licq-includes=../../include
+ make %{?jobs:-j%jobs}
+###
cd ../console
make -f Makefile.cvs
aclocal
@@ -168,6 +203,8 @@
make DESTDIR=$RPM_BUILD_ROOT install
cd plugins/rms
make DESTDIR=$RPM_BUILD_ROOT install
+ cd ../icqnd-0.1.9.5
+ make DESTDIR=$RPM_BUILD_ROOT install
cd ../console
make DESTDIR=$RPM_BUILD_ROOT install
cd ../qt-gui
@@ -193,10 +230,10 @@
%endif
%clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root)
+%defattr(-,root,root,755)
%doc %{_prefix}/share/doc/packages/licq/
%{_prefix}/bin/licq
%{_prefix}/bin/viewurl-lynx.sh
@@ -212,8 +249,37 @@
/usr/share/applications/licq.desktop
/usr/share/pixmaps/licq.png
%exclude %{_libdir}/licq/*.*a
+%exclude %{_libdir}/licq/licq_icqnd.so
+%exclude /usr/share/licq/icqnd
+
+%files icqnd
+%defattr(-,root,root,755)
+%{_libdir}/licq/licq_icqnd.so
+/usr/share/licq/icqnd
%changelog -n licq
+* Wed Jul 12 2006 - lmichnovic@suse.cz
+- filled in description and Author for icqnd subpackage
+* Tue Jul 11 2006 - lmichnovic@suse.cz
+- incorect lib dir and wrong pointer type punning on 64bit archs regarding
+ only icqnd plugin fixed in icqnd-0.1.9.5-cast_on_64bit.patch
+* Tue Jul 11 2006 - lmichnovic@suse.cz
+- update to svn version to date 20060711
+- fixes uninitialized variable [#190016]
+- URL can contain '#' fix
+- adjusted patches: config-fix and emoticons due to changes in
+ Makefile for qt, msn and console plugins
+- due to change of creating desktop file in Makefile also for KDE
+ into kde dir, patch two_desktop_files fixes this duplication
+- added icqnd gtk2 plugin version 0.1.9.5 and building as subpackage
+ this plugin needs gtk2-devel in BuildRequires
+* Tue Jun 06 2006 - lmichnovic@suse.cz
+- upgrade to uptodate svn version,
+ obsoletes unicode.patch and user_picture.patch
+- updated regexp for URL in emoticons.patch because URL can
+ contain '#'
+- removed xosd-devel and gtk-devel from BuildRequires
+ (xosd plugin is not maintened any more)
* Tue May 30 2006 - adrian@suse.de
- fix build for < 10.1
* Thu May 25 2006 - lmichnovic@suse.cz
++++++ icqnd-0.1.9.5-cast_on_64bit.patch ++++++
# it prevents to install libs into different dir (it belong into .../lib64/...)
--- plugins/icqnd-0.1.9.5/src/Makefile.am
+++ plugins/icqnd-0.1.9.5/src/Makefile.am
@@ -1,7 +1,7 @@
## icqnd makefile for the sources
# installation path (set via the -rpath parameter)
-libdir = $(prefix)/lib/licq
+#libdir = $(prefix)/lib/licq
INCLUDES = -I$(LICQ_INCLUDES)\
--- plugins/icqnd-0.1.9.5/src/chatwindow.cpp
+++ plugins/icqnd-0.1.9.5/src/chatwindow.cpp
@@ -2325,8 +2325,8 @@
guint menu,
selection;
- menu = (guint)g_object_get_data(G_OBJECT(item), "ICQmenuMENU");
- selection = (guint)g_object_get_data(G_OBJECT(item), "ICQmenuID");
+ menu = (uintptr_t)g_object_get_data(G_OBJECT(item), "ICQmenuMENU");
+ selection = (uintptr_t)g_object_get_data(G_OBJECT(item), "ICQmenuID");
switch(menu)
{
--- plugins/icqnd-0.1.9.5/src/historywindow.cpp
+++ plugins/icqnd-0.1.9.5/src/historywindow.cpp
@@ -581,11 +581,11 @@
data = g_object_get_data(G_OBJECT(w), "icqnd-hdata");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
- ((IMHistoryManager*)hw->manager)->readMask = ((IMHistoryManager*)hw->manager)->readMask | (guint)data;
+ ((IMHistoryManager*)hw->manager)->readMask = ((IMHistoryManager*)hw->manager)->readMask | (uintptr_t)data;
else
{
- if (((IMHistoryManager*)hw->manager)->readMask & (guint)data)
- ((IMHistoryManager*)hw->manager)->readMask = ((IMHistoryManager*)hw->manager)->readMask ^ (guint)data;
+ if (((IMHistoryManager*)hw->manager)->readMask & (uintptr_t)data)
+ ((IMHistoryManager*)hw->manager)->readMask = ((IMHistoryManager*)hw->manager)->readMask ^ (uintptr_t)data;
}
((IMHistoryManager*)hw->manager)->resetHistoryReading();
hw->showEntries();
--- plugins/icqnd-0.1.9.5/src/mainwindow.cpp
+++ plugins/icqnd-0.1.9.5/src/mainwindow.cpp
@@ -1418,8 +1418,8 @@
guint menu,
selection;
- menu = (guint)g_object_get_data(G_OBJECT(item), "ICQmenuMENU");
- selection = (guint)g_object_get_data(G_OBJECT(item), "ICQmenuID");
+ menu = (uintptr_t)g_object_get_data(G_OBJECT(item), "ICQmenuMENU");
+ selection = (uintptr_t)g_object_get_data(G_OBJECT(item), "ICQmenuID");
if (selection != MENU_NONE && mw->menuCallBack)
mw->menuCallBack(item, menu, selection, mw->menuCallBackData);
++++++ licq-20060522-bool.patch -> licq-20060711-bool.patch ++++++
++++++ licq-20060522-datetime.patch -> licq-20060711-datetime.patch ++++++
++++++ licq-20060522-declaration.patch -> licq-20060711-declaration.patch ++++++
++++++ licq-20060522-emoticons.patch -> licq-20060711-emoticons.patch ++++++
--- KDE/licq/licq-20060522-emoticons.patch 2006-05-30 07:20:23.000000000 +0200
+++ licq/licq-20060711-emoticons.patch 2006-07-11 12:09:36.000000000 +0200
@@ -179,8 +179,8 @@
mmlistview.h mmsenddlg.h userinfodlg.h usereventdlg.h keyrequestdlg.h \
jfcstyle.h usercodec.h reqauthdlg.h licqdialog.h userselectdlg.h \
editfilelistdlg.h emoticon.h catdlg.h phonedlg.h ownermanagerdlg.h \
-- gpgkeyselect.h gpgkeymanager.h licqkimiface.h kimiface.h
-+ gpgkeyselect.h gpgkeymanager.h licqkimiface.h kimiface.h emotnode.h
+- gpgkeyselect.h gpgkeymanager.h licqkimiface.h kimiface.h support.h
++ gpgkeyselect.h gpgkeymanager.h licqkimiface.h kimiface.h emotnode.h support.h
licq_gui = adduserdlg.cpp authuserdlg.cpp awaymsgdlg.cpp \
refusedlg.cpp chatdlg.cpp editgrp.cpp editfile.cpp eventdesc.cpp \
@@ -188,8 +188,8 @@
mmsenddlg.cpp userinfodlg.cpp usereventdlg.cpp keyrequestdlg.cpp \
jfcstyle.cpp usercodec.cpp reqauthdlg.cpp licqdialog.cpp userselectdlg.cpp \
editfilelistdlg.cpp emoticon.cpp catdlg.cpp phonedlg.cpp \
-- ownermanagerdlg.cpp gpgkeyselect.cpp gpgkeymanager.cpp
-+ ownermanagerdlg.cpp gpgkeyselect.cpp gpgkeymanager.cpp emotnode.cpp
+- ownermanagerdlg.cpp gpgkeyselect.cpp gpgkeymanager.cpp support.cpp
++ ownermanagerdlg.cpp gpgkeyselect.cpp gpgkeymanager.cpp emotnode.cpp support.cpp
licq_qt_gui_la_SOURCES = $(licq_gui)
licq_kde_gui_la_SOURCES = $(licq_gui) wrap_kde_malloc.cpp \
@@ -462,7 +462,7 @@
+ QString fill;
+ int bpos = 0;
+ int epos = 0;
-+ QRegExp reURL("(\\b|^)((https?|ftp)://([-a-z0-9]+(:[-a-z0-9]+)?@)?[-a-z0-9.]+[-a-z0-9](:[0-9]+)?(/([-a-z0-9%{}|\\\\^~`;/?:@=&$_.+!*'(),]|\\[|\\])*)?)");
++ QRegExp reURL("(\\b|^)((https?|ftp)://([-a-z0-9]+(:[-a-z0-9]+)?@)?[-a-z0-9.]+[-a-z0-9](:[0-9]+)?(/([-a-z0-9%{}|\\\\^~`;/?:@=#&$_.+!*'(),]|\\[|\\])*)?)");
+ reURL.setMinimal(false);
+ reURL.setCaseSensitive(false);
+ do
++++++ licq-20060522-nostrip.patch -> licq-20060711-nostrip.patch ++++++
++++++ licq-20060711-two_desktop_files.patch ++++++
--- plugins/qt-gui/share/Makefile.am
+++ plugins/qt-gui/share/Makefile.am
@@ -16,7 +16,6 @@
fi; \
appsdir=`echo $$appsdir | sed -e 's#$${datadir}#$(datadir)#'`; \
$(mkinstalldirs) $(DESTDIR)$$appsdir; \
- $(INSTALL_DATA) $(srcdir)/licq.desktop $(DESTDIR)$$appsdir; \
else \
$(mkinstalldirs) $(DESTDIR)$(datadir)/applications; \
$(INSTALL_DATA) $(srcdir)/licq.desktop $(DESTDIR)$(datadir)/applications; \
++++++ licq-20060522-userinfodlg.patch -> licq-20060711-userinfodlg.patch ++++++
++++++ licq-20060522-viewurl.patch -> licq-20060711-viewurl.patch ++++++
++++++ licq-20060522.tar.bz2 -> licq-20060711.tar.bz2 ++++++
++++ 147403 lines of diff (skipped)
++++++ licq-config-fix.patch ++++++
--- /var/tmp/diff_new_pack.PiEvrk/_old 2006-07-12 12:14:53.000000000 +0200
+++ /var/tmp/diff_new_pack.PiEvrk/_new 2006-07-12 12:14:53.000000000 +0200
@@ -94,10 +94,9 @@
--- plugins/console/src/Makefile.am
+++ plugins/console/src/Makefile.am
-@@ -1,5 +1,5 @@
- #HACK, FIXME this in a clean manner
--libdir = $(prefix)/lib/licq/
-+#libdir = $(prefix)/lib/licq/
+@@ -1,4 +1,4 @@
+-libdir=@libdir@/licq/
++#libdirlibdir=@libdir@/licq/
plugindir = $(libdir)
licq_incdir = @LICQ_INCLUDES@
@@ -112,21 +111,19 @@
--- plugins/msn/src/Makefile.am
+++ plugins/msn/src/Makefile.am
-@@ -1,5 +1,5 @@
- #HACK, FIXME this in a clean manner
--libdir = $(prefix)/lib/licq/
-+#libdir = $(prefix)/lib/licq/
+@@ -1,4 +1,4 @@
+-libdir=@libdir@/licq/
++#libdir=@libdir@/licq/
plugindir = $(libdir)
licq_incdir = @LICQ_INCLUDES@
--- plugins/qt-gui/src/Makefile.am
+++ plugins/qt-gui/src/Makefile.am
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
EXTRA_DIST = xpm
- #hack, FIXME this in a clean manner
--libdir=$(prefix)/lib/licq
-+#libdir=$(prefix)/lib/licq
+-libdir=@libdir@/licq/
++#libdir=@libdir@/licq/
licq_incdir = $(LICQ_INCLUDES)
AM_CPPFLAGS = -D_REENTRANT \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org