rpms/purple-microblog/F-8 0001-Clean-out-compiler-warnings.patch, NONE, 1.1 0002-Fixing-build-system.patch, NONE, 1.1 mbpurple-MC-build.patch, NONE, 1.1
Matej Cepl
mcepl at fedoraproject.org
Mon Sep 15 08:19:30 UTC 2008
Author: mcepl
Update of /cvs/extras/rpms/purple-microblog/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8039
Added Files:
0001-Clean-out-compiler-warnings.patch
0002-Fixing-build-system.patch mbpurple-MC-build.patch
Log Message:
Adding patches
0001-Clean-out-compiler-warnings.patch:
--- NEW FILE 0001-Clean-out-compiler-warnings.patch ---
>From fe055b25b4a6442c3a5a94595c7f36d962966591 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl at redhat.com>
Date: Thu, 11 Sep 2008 14:50:56 +0200
Subject: [PATCH] Clean out compiler warnings.
The last item in struct PurpleProtocolOptions (cursed be the one who
created struct of this size!) should be unsigned int not gpointer.
Also, one missing casting and one unused function were cleaned up.
---
microblog/mb_http.c | 2 +-
microblog/twitter.c | 2 +-
twitgin/twitgin.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/microblog/mb_http.c b/microblog/mb_http.c
index 1e290ab..2e0fa18 100644
--- a/microblog/mb_http.c
+++ b/microblog/mb_http.c
@@ -429,7 +429,7 @@ static void mb_http_data_prepare_write(MbHttpData * data)
// content-length, if needed
if(data->content) {
- len = sprintf(cur_packet, "Content-Length: %d\r\n", data->content->len);
+ len = sprintf(cur_packet, "Content-Length: %d\r\n", (int)data->content->len);
cur_packet += len;
}
diff --git a/microblog/twitter.c b/microblog/twitter.c
index 8ab48e3..dd22d00 100644
--- a/microblog/twitter.c
+++ b/microblog/twitter.c
@@ -971,7 +971,7 @@ PurplePluginProtocolInfo twitter_prpl_info = {
NULL, /* unregister_user */
NULL, /* send_attention */
NULL, /* attention_types */
- (gpointer)sizeof(PurplePluginProtocolInfo) /* struct_size */
+ sizeof(PurplePluginProtocolInfo) /* struct_size */
};
#ifndef TWITTER_API
diff --git a/twitgin/twitgin.c b/twitgin/twitgin.c
index cede034..8498290 100644
--- a/twitgin/twitgin.c
+++ b/twitgin/twitgin.c
@@ -77,12 +77,12 @@ static void twitgin_entry_buffer_on_changed(PidginConversation *gtkconv) {
}
/* Editable stuff */
-static void twitgin_preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml) {
+//static void twitgin_preinsert_cb(GtkTextBuffer *buffer, GtkTextIter *iter, gchar *text, gint len, GtkIMHtml *imhtml) {
// TODO:
// if(strcmp(text,"tw:")==0) {
// g_signal_stop_emission_by_name(buffer, "insert-text");
// }
-}
+//}
static void create_twitter_label(PidginConversation *gtkconv) {
GtkWidget *label = gtk_label_new(TW_MAX_MESSAGE_SIZE_TEXT);
--
1.6.0.1
0002-Fixing-build-system.patch:
--- NEW FILE 0002-Fixing-build-system.patch ---
diff -up mbpurple-0.1.2/Makefile.fix-Makefile mbpurple-0.1.2/Makefile
--- mbpurple-0.1.2/Makefile.fix-Makefile 2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/Makefile 2008-09-11 15:51:58.000000000 +0200
@@ -5,6 +5,7 @@
include version.mak
SUBDIRS = microblog twitgin
+DISTFILES = COPYING global.mak Makefile mbpurple.nsi README.txt version.mak
.PHONY: all install clean build distdir
@@ -21,6 +22,7 @@ distdir:
for dir in $(SUBDIRS); do \
make -C "$$dir" dist; \
done
+ cp -f $(DISTFILES) $(PACKAGE)-$(VERSION)/
dist: distdir
tar -zcvf $(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)-$(VERSION)
diff -up mbpurple-0.1.2/version.mak.fix-Makefile mbpurple-0.1.2/version.mak
--- mbpurple-0.1.2/version.mak.fix-Makefile 2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/version.mak 2008-09-11 15:51:12.000000000 +0200
@@ -1,2 +1,2 @@
-PACKAGE := mbpurple
-VERSION := 0.2.1
\ Chybà znak konce Åádku na konci souboru
+PACKAGE := mbpurple
+VERSION := 0.1.2
mbpurple-MC-build.patch:
--- NEW FILE mbpurple-MC-build.patch ---
diff -up mbpurple-0.1.2/global.mak.RH-build mbpurple-0.1.2/global.mak
--- mbpurple-0.1.2/global.mak.RH-build 2008-09-09 08:13:00.000000000 +0200
+++ mbpurple-0.1.2/global.mak 2008-09-13 22:08:26.000000000 +0200
@@ -54,18 +54,21 @@ PLUGIN_SUFFIX := .dll
else
# LINUX and others, use pkg-config
PURPLE_LIBS = $(shell pkg-config --libs purple)
-PURPLE_CFLAGS = -DPURPLE_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
+PURPLE_CFLAGS := $(CFLAGS) -DPURPLE_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
PURPLE_CFLAGS += $(shell pkg-config --cflags purple)
PURPLE_CFLAGS += -Wall -pthread -I. -g -O2 -pipe -fPIC -DPIC
PLUGIN_SUFFIX := .so
PURPLE_PROTOCOL_PIXMAP_DIR := $(DESTDIR)$(PREFIX)/share/pixmaps/pidgin/protocols
-PURPLE_PLUGIN_DIR := $(DESTDIR)$(PREFIX)/lib/purple-2
+PURPLE_PLUGIN_DIR := $(DESTDIR)$(LIBDIR)/purple-2
PIDGIN_LIBS = $(shell pkg-config --libs pidgin)
-PIDGIN_CFLAGS = -DPIDGIN_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
+PIDGIN_CFLAGS := $(CFLAGS) -DPIDGIN_PLUGINS -DENABLE_NLS -DMBPURPLE_VERSION=\"$(VERSION)\"
PIDGIN_CFLAGS += $(shell pkg-config --cflags pidgin)
PIDGIN_CFLAGS += -Wall -pthread -I. -g -O2 -pipe -fPIC -DPIC
+
+LDFLAGS := $(shell (echo $(PIDGIN_CFLAGS) $(PURPLE_CFLAGS)| tr ' ' '\n' | awk '!a[$$0]++' | tr '\n' ' '))
+
endif
dist: $(DISTFILES)
More information about the fedora-extras-commits
mailing list