> version bump, hopefully, closes #63111

6 files changed, 19 insertions, 76 deletions

diff --git a/net-im/licq/files/1.3.0-gcc3.4.patch b/net-im/licq/files/1.3.0-gcc3.4.patch
deleted file mode 100644
index 8f475fd4ec9d..000000000000
--- a/net-im/licq/files/1.3.0-gcc3.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mainwin.cpp.orig	2004-08-22 03:16:54.000000000 +0400
-+++ mainwin.cpp	2004-08-22 03:13:18.000000000 +0400
-@@ -3960,7 +3960,7 @@
- 
-    mnuStatus = new QPopupMenu(NULL);
-    mnuPFM = new QPopupMenu(NULL);
--   mnuPFM->insertItem(tr("Don't Show"), ICQ_PLUGIN_STATUSxINACTIVE);
-+   mnuPFM->insertItem(tr("Don't Show"), (int) ICQ_PLUGIN_STATUSxINACTIVE);
-    mnuPFM->insertItem(tr("Available"), ICQ_PLUGIN_STATUSxACTIVE);
-    mnuPFM->insertItem(tr("Busy"), ICQ_PLUGIN_STATUSxBUSY);
-    connect(mnuPFM, SIGNAL(activated(int)), this, SLOT(changePFMStatus(int)));
diff --git a/net-im/licq/files/1.3.0-gpgme3_hack.patch b/net-im/licq/files/1.3.0-gpgme3_hack.patch
deleted file mode 100644
index 996b4169edbd..000000000000
--- a/net-im/licq/files/1.3.0-gpgme3_hack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- configure~	2004-08-22 20:10:52.000000000 +0400
-+++ configure	2004-08-22 20:11:10.000000000 +0400
-@@ -6388,7 +6388,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgpgme  $LIBS"
-+LIBS="-lgpgme3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -6438,7 +6438,7 @@
- echo "${ECHO_T}$ac_cv_lib_gpgme_gpgme_check_version" >&6
- if test $ac_cv_lib_gpgme_gpgme_check_version = yes; then
- 
--                    LIBS="$LIBS -lgpgme"
-+                    LIBS="$LIBS -lgpgme3"
- 
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBGPGME 1
---- include/licq_gpg.h.orig	2004-08-22 22:58:46.660566481 +0400
-+++ include/licq_gpg.h	2004-08-22 22:57:15.460429001 +0400
-@@ -3,7 +3,7 @@
- #define _LICQ_GPG_H_INCLUDED_
- 
- #ifdef HAVE_LIBGPGME
--#include <gpgme.h>
-+#include <gpgme3/gpgme.h>
- #endif
- #include <pthread.h>
- 
diff --git a/net-im/licq/files/1.3.0-no_stupid_koloboks.patch b/net-im/licq/files/1.3.0-no_stupid_koloboks.patch
index a76080c2845e..76ee1be9eb48 100644
--- a/net-im/licq/files/1.3.0-no_stupid_koloboks.patch
+++ b/net-im/licq/files/1.3.0-no_stupid_koloboks.patch
@@ -1,9 +1,7 @@
-Only in src~: 1.3.0-no_stupid_koloboks.patch
-Common subdirectories: src/CVS and src~/CVS
-diff -u src/mainwin.h src~/mainwin.h
---- src/mainwin.h	2004-08-10 17:49:24.000000000 +0400
-+++ src~/mainwin.h	2004-08-20 22:49:01.383931834 +0400
-@@ -131,6 +131,7 @@
+diff -uraN src/mainwin.h src~/mainwin.h
+--- src/mainwin.h	2004-09-15 19:14:06.000000000 +0400
++++ src~/mainwin.h	2004-09-28 19:16:56.485815523 +0400
+@@ -150,6 +150,7 @@
         m_bAutoPosReplyWin,
         m_bAutoSendThroughServer,
         m_bEnableMainwinMouseMovement,
@@ -11,24 +9,22 @@ diff -u src/mainwin.h src~/mainwin.h
         m_bPopEmail,
         m_bPopPhone,
         m_bPopFax,
-diff -u src/mlview3.cpp src~/mlview3.cpp
---- src/mlview3.cpp	2004-08-20 23:21:25.338742474 +0400
-+++ src~/mlview3.cpp	2004-08-20 23:26:33.794602521 +0400
+diff -uraN src/mlview3.cpp src~/mlview3.cpp
+--- src/mlview3.cpp	2004-01-17 16:18:18.000000000 +0300
++++ src~/mlview3.cpp	2004-09-28 19:17:53.767142190 +0400
 @@ -83,7 +83,8 @@
    // not used for html now QString text = QStyleSheet::escape(s);
    QString text = useHTML ? s: QStyleSheet::escape(s);
  
 -  gMainWindow->emoticons->ParseMessage(text);
 +  if (gMainWindow->m_bShowKoloboks)
-+     gMainWindow->emoticons->ParseMessage(text);
++    gMainWindow->emoticons->ParseMessage(text);
  
      // We must hightlight URLs at this step, before we convert
      // linebreaks to richtext tags and such.  Also, check to make sure
-Common subdirectories: src/moc and src~/moc
-Common subdirectories: src/obj and src~/obj
-diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
---- src/optionsdlg.cpp	2004-07-12 05:36:17.000000000 +0400
-+++ src~/optionsdlg.cpp	2004-08-20 22:53:43.592957691 +0400
+diff -uraN src/optionsdlg.cpp src~/optionsdlg.cpp
+--- src/optionsdlg.cpp	2004-09-06 16:50:56.000000000 +0400
++++ src~/optionsdlg.cpp	2004-09-28 19:19:38.975690580 +0400
 @@ -216,6 +216,7 @@
    chkAutoPosReplyWin->setChecked(mainwin->m_bAutoPosReplyWin);
    chkAutoSendThroughServer->setChecked(mainwin->m_bAutoSendThroughServer);
@@ -37,7 +33,7 @@ diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
    popEmail->setChecked(mainwin->m_bPopEmail);
    popPhone->setChecked(mainwin->m_bPopPhone);
    popFax->setChecked(mainwin->m_bPopFax);
-@@ -491,6 +492,7 @@
+@@ -494,6 +495,7 @@
    mainwin->m_bAutoPosReplyWin = chkAutoPosReplyWin->isChecked();
    mainwin->m_bAutoSendThroughServer = chkAutoSendThroughServer->isChecked();
    mainwin->m_bEnableMainwinMouseMovement = chkEnableMainwinMouseMovement->isChecked();
@@ -45,7 +41,7 @@ diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
  
    mainwin->m_bPopEmail= popEmail->isChecked();
    mainwin->m_bPopPhone= popPhone->isChecked();
-@@ -752,6 +754,8 @@
+@@ -768,6 +770,8 @@
    chkEnableMainwinMouseMovement = new QCheckBox(tr("Allow dragging main window"), boxMainWin);
    QWhatsThis::add(chkEnableMainwinMouseMovement, tr("Lets you drag around the main window "
     "with your mouse"));
@@ -54,16 +50,16 @@ diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
  
    chkMsgChatView = new QCheckBox(tr("Chatmode Messageview"), boxMainWin);
    QWhatsThis::add(chkMsgChatView, tr("Show the current chat history in Send Window"));
-diff -u src/optionsdlg.h src~/optionsdlg.h
+diff -uraN src/optionsdlg.h src~/optionsdlg.h
 --- src/optionsdlg.h	2004-07-12 05:36:17.000000000 +0400
-+++ src~/optionsdlg.h	2004-08-20 23:22:49.063329574 +0400
-@@ -79,7 +79,7 @@
++++ src~/optionsdlg.h	2004-09-28 19:19:52.303971975 +0400
+@@ -79,7 +79,8 @@
               *chkAlwaysShowONU, *chkScrollBar, *chkShowExtIcons,
               *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin,
  	     *chkAutoSendThroughServer, *chkTabbedChatting,
 -             *chkEnableMainwinMouseMovement;
-+             *chkEnableMainwinMouseMovement, *chkShowKoloboks;
++             *chkEnableMainwinMouseMovement,
++	     *chkShowKoloboks;
     QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;
     QComboBox *cmbDockTheme, *cmbSortBy;
  
-Common subdirectories: src/xpm and src~/xpm
diff --git a/net-im/licq/files/1.3.0-upgradepath.patch b/net-im/licq/files/1.3.0-upgradepath.patch
deleted file mode 100644
index be1b849b5afc..000000000000
--- a/net-im/licq/files/1.3.0-upgradepath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/licq.cpp-	2004-08-20 17:15:21.151114440 +0400
-+++ src/licq.cpp	2004-08-20 17:16:07.409616782 +0400
-@@ -332,7 +332,7 @@
-     fprintf(stderr, tr("Previous Licq config files detected.\n"
-                        "Manual upgrade is necessary.  Follow the instructions\n"
-                        "in the UPGRADE file included with the source tree or\n"
--                       "in /usr/doc/licq-xxx/upgrade.\n"));
-+                       "run /usr/share/licq/upgrade/upgrade-1.3.0.sh\n"));
-     return false;
-   }
-   if (nVersion < INT_VERSION)
diff --git a/net-im/licq/files/digest-licq-1.3.0_pre-r5 b/net-im/licq/files/digest-licq-1.3.0_pre-r5
deleted file mode 100644
index c750dc0bb3eb..000000000000
--- a/net-im/licq/files/digest-licq-1.3.0_pre-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d063b6f5d29d6bc73d9e59a119137a7c licq-1.3.0-PRE.tar.bz2 3697628
diff --git a/net-im/licq/files/digest-licq-1.3.0_pre2 b/net-im/licq/files/digest-licq-1.3.0_pre2
new file mode 100644
index 000000000000..07ac55006891
--- /dev/null
+++ b/net-im/licq/files/digest-licq-1.3.0_pre2
@@ -0,0 +1 @@
+MD5 02cea8243ece7b595e29c3ee716e0d7b licq-1.3.0-PRE2.tar.bz2 4237957