From 2766ea08070fae6b438cd5a4ed7277e9ea17e835 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sun, 12 Feb 2006 13:24:52 +0000
Subject: gaim_cvs: drop strftime and desktop-name patches - Drop the
configure-strftime.patch again. Upstream decided to always enable the
compatibility code when cross compiling. - Delete the unused
desktop-name-cvs.patch.
---
packages/gaim/files/configure-strftime.patch | 25 ---------------------
packages/gaim/files/desktop-name-cvs.patch | 33 ----------------------------
packages/gaim/gaim_cvs.bb | 1 -
3 files changed, 59 deletions(-)
delete mode 100644 packages/gaim/files/configure-strftime.patch
delete mode 100644 packages/gaim/files/desktop-name-cvs.patch
(limited to 'packages/gaim')
diff --git a/packages/gaim/files/configure-strftime.patch b/packages/gaim/files/configure-strftime.patch
deleted file mode 100644
index 80621055f1..0000000000
--- a/packages/gaim/files/configure-strftime.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gaim/configure.ac 2006-02-09 00:04:40.000000000 +0100
-+++ gaim/configure.ac 2006-02-09 22:37:00.000000000 +0100
-@@ -111,6 +111,14 @@
- AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
-
- AC_MSG_CHECKING(for the %z format string in strftime())
-+
-+if test "x$gaim_cv_HAVE_STRFTIME_Z_FORMAT" = "xyes"; then
-+ AC_MSG_RESULT(yes)
-+ AC_DEFINE([HAVE_STRFTIME_Z_FORMAT], [1],
-+ [Define to 1 if you have a strftime() that supports the %z format string.])
-+elif test "x$gaim_cv_HAVE_STRFTIME_Z_FORMAT" = "xno"; then
-+ AC_MSG_RESULT(no)
-+else
- AC_TRY_RUN([
- #ifdef HAVE_SYS_TIME_H
- #include <sys/time.h>
-@@ -145,6 +153,7 @@
- AC_MSG_RESULT(no)
- ]
- )
-+fi
-
-
- dnl #######################################################################
diff --git a/packages/gaim/files/desktop-name-cvs.patch b/packages/gaim/files/desktop-name-cvs.patch
deleted file mode 100644
index d3ab483119..0000000000
--- a/packages/gaim/files/desktop-name-cvs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- gaim/gaim.desktop.orig 2005-11-03 22:34:17 +0100
-+++ gaim/gaim.desktop 2005-11-03 22:34:50 +0100
-@@ -7,29 +7,7 @@
- Terminal=false
- Type=Application
-
--Name=Gaim Internet Messenger
--Name[ca]=Missatger d'Internet Gaim
--Name[cs]=Gaim Internet Messenger
--Name[da]=Gaim - internet beskeder
--Name[de]=Gaim Internet Messenger
--Name[es]=Gaim - cliente de mensajería de Internet
--Name[fr]=Gaim Messagerie Internet
--Name[hu]=Gaim azonnali üzenetküldő
--Name[it]=Gaim Internet Messenger
--Name[ja]=Gaim インターネット・メッセンジャー
--Name[ko]=게임 메신저
--Name[nb]=Gaim lynmeldingsklient
--Name[nl]=Gaim - Expresberichten
--Name[pl]=Komunikator Internetowy Gaim
--Name[pt_BR]=Mensageiro via Internet Gaim
--Name[pt]=Mensageiro Internet Gaim
--Name[ro]=Mesagerul Gaim
--Name[ru]=Gaim - клиент обмена мгновенными сообщениями
--Name[sl]=Gaim - spletni sel
--Name[sq]=Lajmësjellësi Internet Gaim
--Name[sv]=Gaim Internet Messenger
--Name[zh_CN]=Gaim 互联网通讯程序
--Name[zh_TW]=Gaim 網路即時通
-+Name=Gaim
-
- GenericName=Internet Messenger
- GenericName[ca]=Missatger d'Internet
diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb
index 2505b1b9eb..faf707a867 100644
--- a/packages/gaim/gaim_cvs.bb
+++ b/packages/gaim/gaim_cvs.bb
@@ -5,7 +5,6 @@ PV = "2.0+cvs-${SRCDATE}"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \
file://no-superimposed-version-on-logo.patch;patch=1 \
file://gtk-deprecated-2.0.0.patch;patch=1 \
- file://configure-strftime.patch;patch=1 \
"
include gaim.inc
--
cgit v1.2.3