forked from pool/pidgin
Accepting request 560763 from network:pidgin
OBS-URL: https://build.opensuse.org/request/show/560763 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin?expand=0&rev=123
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
6a9f784364
@ -1,22 +0,0 @@
|
||||
Index: pidgin-2.10.10/pidgin/gtkmain.c
|
||||
===================================================================
|
||||
--- pidgin-2.10.10.orig/pidgin/gtkmain.c
|
||||
+++ pidgin-2.10.10/pidgin/gtkmain.c
|
||||
@@ -75,7 +75,7 @@
|
||||
#endif
|
||||
|
||||
#include <getopt.h>
|
||||
-
|
||||
+#include <gst/gst.h>
|
||||
|
||||
#ifdef HAVE_SIGNAL_H
|
||||
|
||||
@@ -528,6 +528,8 @@ int main(int argc, char *argv[])
|
||||
*/
|
||||
g_thread_init(NULL);
|
||||
#endif
|
||||
+ /* make sure Gst is initialized before any other Glib/Gst calls (see Gst docs) */
|
||||
+ gst_init(NULL, NULL);
|
||||
|
||||
g_set_prgname("Pidgin");
|
||||
|
||||
@ -1,3 +1,23 @@
|
||||
--- a/libpurple/Makefile.am
|
||||
+++ b/libpurple/Makefile.am
|
||||
@@ -47,6 +47,8 @@ purple_coresources = \
|
||||
desktopitem.c \
|
||||
eventloop.c \
|
||||
ft.c \
|
||||
+ purple-fifo.c \
|
||||
+ purple-io.c \
|
||||
idle.c \
|
||||
imgstore.c \
|
||||
log.c \
|
||||
@@ -114,6 +116,8 @@ purple_coreheaders = \
|
||||
desktopitem.h \
|
||||
eventloop.h \
|
||||
ft.h \
|
||||
+ purple-fifo.h \
|
||||
+ purple-io.h \
|
||||
gaim-compat.h \
|
||||
idle.h \
|
||||
imgstore.h \
|
||||
--- a/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
+++ b/libpurple/plugins/ssl/ssl-gnutls.c
|
||||
@@ -435,8 +435,6 @@ ssl_gnutls_close(PurpleSslConnection *gs
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
Index: pidgin-2.7.6/libpurple/Makefile.am
|
||||
===================================================================
|
||||
--- pidgin-2.7.6.orig/libpurple/Makefile.am
|
||||
+++ pidgin-2.7.6/libpurple/Makefile.am
|
||||
@@ -50,6 +50,8 @@ purple_coresources = \
|
||||
desktopitem.c \
|
||||
eventloop.c \
|
||||
ft.c \
|
||||
+ purple-fifo.c \
|
||||
+ purple-io.c \
|
||||
idle.c \
|
||||
imgstore.c \
|
||||
log.c \
|
||||
@@ -117,6 +119,8 @@ purple_coreheaders = \
|
||||
desktopitem.h \
|
||||
eventloop.h \
|
||||
ft.h \
|
||||
+ purple-fifo.h \
|
||||
+ purple-io.h \
|
||||
gaim-compat.h \
|
||||
idle.h \
|
||||
imgstore.h \
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 29 14:06:45 UTC 2017 - sor.alexei@meowr.ru
|
||||
|
||||
- Remove pidgin-crash-missing-gst-registry.patch: is useless now
|
||||
and is potentially harmful.
|
||||
- Merge pidgin-nonblock-common2.patch to
|
||||
pidgin-nonblock-common.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 21 08:06:04 UTC 2017 - fezhang@suse.com
|
||||
|
||||
|
||||
65
pidgin.spec
65
pidgin.spec
@ -32,18 +32,14 @@ Source3: pidgin-prefs.xml
|
||||
Patch0: pidgin-nonblock-common.patch
|
||||
# PATCH-FIX-OPENSUSE pidgin-nonblock-gwim.patch
|
||||
Patch1: pidgin-nonblock-gwim.patch
|
||||
# PATCH-FIX-OPENSUSE pidgin-nonblock-common2.patch
|
||||
Patch2: pidgin-nonblock-common2.patch
|
||||
# PATCH-FEATURE-SLE pidgin-gnome-keyring.patch
|
||||
Patch3: pidgin-gnome-keyring.patch
|
||||
# PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert http://developer.pidgin.im/viewmtn/revision/info/f32151852a00fb5abd3fdccdd8df2419031666de as it breaks the build.
|
||||
Patch4: pidgin-fix-perl-build.patch
|
||||
# PATCH-FIX-UPSTREAM pidgin-crash-missing-gst-registry.patch boo#866455 pidgin.im#16224 cxiong@suse.com -- Fix crash when GST registry cache file is missing.
|
||||
Patch5: pidgin-crash-missing-gst-registry.patch
|
||||
Patch2: pidgin-gnome-keyring.patch
|
||||
# PATCH-FIX-OPENSUSE pidgin-fix-perl-build.patch vuntz@opensuse.org -- Revert https://bitbucket.org/pidgin/main/commits/a083625 as it breaks the build.
|
||||
Patch3: pidgin-fix-perl-build.patch
|
||||
# PATCH-FIX-UPSTREAM pidgin-ncurses-6.0-accessors.patch pidgin.im#16764 dimstar@opensuse.org -- Fix build with NCurses 6.0 with WINDOW_OPAQUE set to 1.
|
||||
Patch6: pidgin-ncurses-6.0-accessors.patch
|
||||
Patch4: pidgin-ncurses-6.0-accessors.patch
|
||||
# PATCH-FIX-SLE pidgin-use-default-alsa.patch bsc#886670 tiwai@suse.de -- Use ALSA as a default for avoiding broken volume control.
|
||||
Patch7: pidgin-use-default-alsa.patch
|
||||
Patch5: pidgin-use-default-alsa.patch
|
||||
BuildRequires: NetworkManager-devel
|
||||
# Can use external libzephyr.
|
||||
BuildRequires: cyrus-sasl-devel
|
||||
@ -72,30 +68,10 @@ BuildRequires: startup-notification-devel
|
||||
BuildRequires: tk-devel
|
||||
BuildRequires: update-desktop-files
|
||||
Requires: perl-base >= %{perl_version}
|
||||
%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse}
|
||||
Recommends: purple-import-empathy
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300
|
||||
BuildRequires: python2-devel
|
||||
%else
|
||||
BuildRequires: python-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse})
|
||||
BuildRequires: farstream-devel >= 0.2.7
|
||||
BuildRequires: gstreamer-devel
|
||||
BuildRequires: gstreamer-plugins-base-devel
|
||||
Recommends: gstreamer-plugins-good
|
||||
%else
|
||||
BuildRequires: gstreamer-0_10-devel
|
||||
BuildRequires: gstreamer-0_10-plugins-base-devel
|
||||
Recommends: gstreamer-0_10-plugins-good
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1120
|
||||
Recommends: %{name}-emoticons-nld
|
||||
Recommends: %{name}-emoticons-tango
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%endif
|
||||
%if 0%{?suse_version} < 1120
|
||||
%if 0%{?suse_version} >= 1120
|
||||
BuildRequires: translation-update-upstream
|
||||
%else
|
||||
# gnome-keyring support summary (boo#566286):
|
||||
# 11.1 & SLE11: patch present and active (boo#569025)
|
||||
# 11.2 and above: patch not applied
|
||||
@ -103,6 +79,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# + does not work well outside GNOME
|
||||
# - passwords are stored in readable form
|
||||
BuildRequires: gnome-keyring-devel
|
||||
Recommends: %{name}-emoticons-nld
|
||||
Recommends: %{name}-emoticons-tango
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1210
|
||||
BuildRequires: libSM-devel
|
||||
@ -118,8 +96,23 @@ Requires: ca-certificates-mozilla
|
||||
BuildRequires: openssl-certs
|
||||
Requires: openssl-certs
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1120
|
||||
BuildRequires: translation-update-upstream
|
||||
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse})
|
||||
BuildRequires: farstream-devel >= 0.2.7
|
||||
BuildRequires: gstreamer-devel
|
||||
BuildRequires: gstreamer-plugins-base-devel
|
||||
Recommends: gstreamer-plugins-good
|
||||
%else
|
||||
BuildRequires: gstreamer-0_10-devel
|
||||
BuildRequires: gstreamer-0_10-plugins-base-devel
|
||||
Recommends: gstreamer-0_10-plugins-good
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300
|
||||
BuildRequires: python2-devel
|
||||
%else
|
||||
BuildRequires: python-devel
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1500 && !0%{?is_opensuse}
|
||||
Recommends: purple-import-empathy
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -267,10 +260,8 @@ translation-update-upstream
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%if 0%{?sle_version} >= 120000 && !0%{?is_opensuse}
|
||||
%patch7 -p1
|
||||
%patch5 -p1
|
||||
%endif
|
||||
|
||||
cp -f %{SOURCE3} %{name}-prefs.xml
|
||||
|
||||
Loading…
Reference in New Issue
Block a user