[Pkg-kde-commits] rev 1084 - in trunk/packages/kdenetwork/debian: . patches
Adeodato Simó
dato-guest@costa.debian.org
Thu, 19 May 2005 23:01:26 +0000
Author: dato-guest
Date: 2005-05-19 23:01:25 +0000 (Thu, 19 May 2005)
New Revision: 1084
Modified:
trunk/packages/kdenetwork/debian/changelog
trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff
Log:
Latest fixes: KDE_OPTIONS = nofinal for kopete/protocols/msn, kudos to
argonel.
Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog 2005-05-19 21:24:20 UTC (rev 1083)
+++ trunk/packages/kdenetwork/debian/changelog 2005-05-19 23:01:25 UTC (rev 1084)
@@ -7,14 +7,15 @@
* Kopete is now able again to log into MSN Messenger accounts, after the
latest change in the Microsoft servers yesterday. (Closes: #309745)
Backported patch from upstream 3.4 SVN branch that introduces a new login
- handler stolen from KMess.
+ handler stolen from KMess. Enabled nofinal for kopete/protocols/msn, since
+ otherwise it won't compile.
* As a result of the above new login handler, Kopete is now able to log into
MSN Messenger accounts with Hotmail or MSN addresses that have a non-.com
TLD (e.g., hotmail.co.uk), which closes: #306845. (The patch at upstream
bug #96304 is now obsolete.)
- -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Thu, 19 May 2005 21:55:54 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Fri, 20 May 2005 00:55:54 +0200
kdenetwork (4:3.3.2-3) unstable; urgency=high
Modified: trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff 2005-05-19 21:24:20 UTC (rev 1083)
+++ trunk/packages/kdenetwork/debian/patches/12_kopete-fix-latest-login-trouble.diff 2005-05-19 23:01:25 UTC (rev 1084)
@@ -1,8 +1,17 @@
diff -u -Nrua kdenetwork-3.3.2/kopete/protocols/msn.orig/Makefile.am kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am
--- kdenetwork-3.3.2/kopete/protocols/msn.orig/Makefile.am 2005-05-19 20:57:29.000000000 +0200
+++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am 2005-05-19 20:59:10.000000000 +0200
-@@ -12,6 +12,7 @@
+@@ -5,6 +5,8 @@
+ $(KOPETE_INCLUDES) \
+ $(all_includes)
++KDE_OPTIONS = nofinal
++
+ kde_module_LTLIBRARIES = kopete_msn.la
+ lib_LTLIBRARIES = libkopete_msn_shared.la
+
+@@ -12,6 +14,7 @@
+
libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \
msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \
+ sslloginhandler.cpp \
@@ -773,7 +782,7 @@
diff -u -Nrua kdenetwork-3.3.2/kopete/protocols/msn.orig/Makefile.in kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in
--- kdenetwork-3.3.2/kopete/protocols/msn.orig/Makefile.in 2005-05-19 18:44:40.000000000 +0000
+++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in 2005-05-19 19:56:57.000000000 +0000
-@@ -72,18 +72,18 @@
+@@ -72,20 +72,17 @@
../../libkopete/libkopete.la $(am__DEPENDENCIES_1)
am_libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \
msnaddcontactpage.lo msncontact.lo msnsocket.lo \
@@ -785,20 +794,30 @@
+ msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo
#>- libkopete_msn_shared_la_OBJECTS = \
#>- $(am_libkopete_msn_shared_la_OBJECTS)
- #>+ 8
- libkopete_msn_shared_la_final_OBJECTS = libkopete_msn_shared_la.all_cpp.lo
- libkopete_msn_shared_la_nofinal_OBJECTS = msnprotocol.lo msnaccount.lo \
+-#>+ 8
+-libkopete_msn_shared_la_final_OBJECTS = libkopete_msn_shared_la.all_cpp.lo
+-libkopete_msn_shared_la_nofinal_OBJECTS = msnprotocol.lo msnaccount.lo \
++#>+ 5
++libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \
msnaddcontactpage.lo msncontact.lo msnsocket.lo \
- msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \
- msnswitchboardsocket.lo msnfiletransfersocket.lo \
- msninvitation.lo msnp2p.lo sha1.lo
+-@KDE_USE_FINAL_FALSE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_nofinal_OBJECTS)
+-@KDE_USE_FINAL_TRUE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_final_OBJECTS)
+ msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \
+ msnnotifysocket.lo msnswitchboardsocket.lo \
+ msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo
- @KDE_USE_FINAL_FALSE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_nofinal_OBJECTS)
- @KDE_USE_FINAL_TRUE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_final_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-@@ -443,6 +443,7 @@
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+@@ -438,11 +435,13 @@
+ $(KOPETE_INCLUDES) \
+ $(all_includes)
+
++KDE_OPTIONS = nofinal
+ kde_module_LTLIBRARIES = kopete_msn.la
+ lib_LTLIBRARIES = libkopete_msn_shared.la
CLEANFILES = dummy.cpp
libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \
msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \
@@ -806,7 +825,7 @@
msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp
libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(LIB_KIO)
-@@ -591,6 +592,7 @@
+@@ -591,6 +590,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnsocket.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnswitchboardsocket.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@
@@ -814,7 +833,16 @@
.cpp.o:
@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -1001,6 +1003,13 @@
+@@ -871,7 +871,7 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- clean-libLTLIBRARIES clean-libtool mostlyclean-am
+ #>+ 2
+-clean-am: clean-metasources clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES \
++clean-am: clean-metasources clean-closures clean-bcheck clean-generic clean-kde_moduleLTLIBRARIES \
+ clean-libLTLIBRARIES clean-libtool mostlyclean-am
+
+ distclean: distclean-recursive
+@@ -1001,6 +1001,13 @@
mocs: msnprotocol.moc
#>+ 3
@@ -828,7 +856,7 @@
msnaccount.moc: $(srcdir)/msnaccount.h
$(MOC) $(srcdir)/msnaccount.h -o msnaccount.moc
-@@ -1053,10 +1062,10 @@
+@@ -1053,10 +1060,10 @@
#>+ 3
clean-metasources:
@@ -841,21 +869,49 @@
#>+ 3
clean-closures:
-@@ -1104,11 +1113,11 @@
+@@ -1103,37 +1110,21 @@
+ done
- #>+ 11
+-#>+ 11
-libkopete_msn_shared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/msnprotocol.cpp $(srcdir)/msnaccount.cpp $(srcdir)/msnaddcontactpage.cpp $(srcdir)/msncontact.cpp $(srcdir)/msnsocket.cpp $(srcdir)/msnmessagemanager.cpp $(srcdir)/msndebugrawcmddlg.cpp $(srcdir)/msnnotifysocket.cpp $(srcdir)/msnswitchboardsocket.cpp $(srcdir)/msnfiletransfersocket.cpp $(srcdir)/msninvitation.cpp $(srcdir)/msnp2p.cpp $(srcdir)/sha1.cpp msndebugrawcmddlg.moc msncontact.moc msnfiletransfersocket.moc msnmessagemanager.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc
-+libkopete_msn_shared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/msnprotocol.cpp $(srcdir)/msnaccount.cpp $(srcdir)/msnaddcontactpage.cpp $(srcdir)/msncontact.cpp $(srcdir)/msnsocket.cpp $(srcdir)/msnmessagemanager.cpp $(srcdir)/msndebugrawcmddlg.cpp $(srcdir)/sslloginhandler.cpp $(srcdir)/msnnotifysocket.cpp $(srcdir)/msnswitchboardsocket.cpp $(srcdir)/msnfiletransfersocket.cpp $(srcdir)/msninvitation.cpp $(srcdir)/msnp2p.cpp $(srcdir)/sha1.cpp msndebugrawcmddlg.moc msncontact.moc msnfiletransfersocket.moc msnmessagemanager.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc
- @echo 'creating libkopete_msn_shared_la.all_cpp.cpp ...'; \
- rm -f libkopete_msn_shared_la.all_cpp.files libkopete_msn_shared_la.all_cpp.final; \
- echo "#define KDE_USE_FINAL 1" >> libkopete_msn_shared_la.all_cpp.final; \
+- @echo 'creating libkopete_msn_shared_la.all_cpp.cpp ...'; \
+- rm -f libkopete_msn_shared_la.all_cpp.files libkopete_msn_shared_la.all_cpp.final; \
+- echo "#define KDE_USE_FINAL 1" >> libkopete_msn_shared_la.all_cpp.final; \
- for file in msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp ; do \
-+ for file in msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp sslloginhandler.cpp msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp ; do \
- echo "#include \"$$file\"" >> libkopete_msn_shared_la.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkopete_msn_shared_la.all_cpp.final; \
- done; \
-@@ -1143,7 +1152,7 @@
+- echo "#include \"$$file\"" >> libkopete_msn_shared_la.all_cpp.files; \
+- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkopete_msn_shared_la.all_cpp.final; \
+- done; \
+- cat libkopete_msn_shared_la.all_cpp.final libkopete_msn_shared_la.all_cpp.files > libkopete_msn_shared_la.all_cpp.cpp; \
+- rm -f libkopete_msn_shared_la.all_cpp.final libkopete_msn_shared_la.all_cpp.files
+-
+-#>+ 3
+-clean-final:
+- -rm -f libkopete_msn_shared_la.all_cpp.cpp
+-
+ #>+ 3
+ final:
+- $(MAKE) libkopete_msn_shared_la_OBJECTS="$(libkopete_msn_shared_la_final_OBJECTS)" all-am
++ $(MAKE) all-am
+
+ #>+ 3
+ final-install:
+- $(MAKE) libkopete_msn_shared_la_OBJECTS="$(libkopete_msn_shared_la_final_OBJECTS)" install-am
++ $(MAKE) install-am
+
+ #>+ 3
+ no-final:
+- $(MAKE) libkopete_msn_shared_la_OBJECTS="$(libkopete_msn_shared_la_nofinal_OBJECTS)" all-am
++ $(MAKE) all-am
+
+ #>+ 3
+ no-final-install:
+- $(MAKE) libkopete_msn_shared_la_OBJECTS="$(libkopete_msn_shared_la_nofinal_OBJECTS)" install-am
++ $(MAKE) install-am
+
+ #>+ 3
+ cvs-clean:
+@@ -1143,7 +1134,7 @@
kde-rpo-clean:
-rm -f *.rpo
@@ -864,7 +920,7 @@
msnnotifysocket.lo: msnnotifysocket.moc
msnprotocol.lo: msnprotocol.moc
msncontact.o: msncontact.moc
-@@ -1154,17 +1163,19 @@
+@@ -1154,17 +1145,19 @@
msnmessagemanager.lo: msnmessagemanager.moc
msndebugrawcmddlg.o: msndebugrawcmddlg.moc
msnsocket.lo: msnsocket.moc