rpms/purple-microblog/F-9 0001-Clean-out-compiler-warnings.patch, NONE, 1.1 0002-Fixing-build-system.patch, NONE, 1.1 import.log, NONE, 1.1 mbpurple-MC-build.patch, NONE, 1.1 purple-microblog.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matej Cepl
mcepl at fedoraproject.org
Mon Sep 15 08:32:36 UTC 2008
- Previous message: [pkgdb] system-config-bind had acl change status
- Next message: rpms/orsa/devel import.log, NONE, 1.1 orsa-configure.patch, NONE, 1.1 orsa-gcc43.patch, NONE, 1.1 orsa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mcepl
Update of /cvs/extras/rpms/purple-microblog/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11327/F-9
Modified Files:
.cvsignore sources
Added Files:
0001-Clean-out-compiler-warnings.patch
0002-Fixing-build-system.patch import.log
mbpurple-MC-build.patch purple-microblog.spec
Log Message:
Initial commit.
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
--- NEW FILE import.log ---
purple-microblog-0_1_2-2_20080911svn148_fc9:F-9:purple-microblog-0.1.2-2.20080911svn148.fc9.src.rpm:1221467286
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)
--- NEW FILE purple-microblog.spec ---
Name: purple-microblog
Version: 0.1.2
Release: 2.20080911svn148%{?dist}
Summary: Libpurple plug-in supporting microblog services like Twitter
Group: Applications/Internet
License: GPLv3+
URL: http://code.google.com/p/microblog-purple/
# The source for this package was pulled from upstream's vcs. Use the
# following commands to generate the tarball:
# svn export -r 148 http://microblog-purple.googlecode.com/svn/trunk mbpurple-%{version}
# tar -czvf mbpurple-svn148.tar.gz mbpurple-%{version}
Source0: http://microblog-purple.googlecode.com/files/mbpurple-svn148.tar.gz
Patch0: 0001-Clean-out-compiler-warnings.patch
Patch1: 0002-Fixing-build-system.patch
Patch9: mbpurple-MC-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pidgin-devel, ElectricFence
%description
The project aims is to develop a set of microblog support in LibPurple base
client like Pidgin. Currently it only support Twitter through the conversation
windows.
Currently the source can be built and run on Windows Vista and Ubuntu 8.04.1.
Other platform with LibPurple should works, but we don't have time (yet) to
test it.
%prep
%setup -q -n mbpurple-%{version}
%patch0 -p1 -b .compiler-warnings
%patch1 -p1 -b .fix-Makefile
%patch9 -p1 -b .RH-build
%build
export CFLAGS="$RPM_OPT_FLAGS"
make LIBDIR=%{_libdir}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/purple-2/libtwitter.so
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING README.txt
%{_libdir}/purple-2/*.so
%{_datadir}/pixmaps/pidgin/protocols/*/twitter.png
%changelog
* Sat Sep 13 2008 MatÄj Cepl <mcepl at redhat.com> 0.1.2-2.20080911svn148
- Updated according to reviewer's comments after approval.
* Sat Sep 13 2008 MatÄj Cepl <mcepl at redhat.com> 0.1.2-1.20080911svn148.1
- Fixing package reviewer's comments.
* Thu Sep 11 2008 Matej Cepl <mcepl at redhat.com> 0.1.2-0.20080911svn148
- Initial build.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/purple-microblog/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 14 Sep 2008 22:21:09 -0000 1.1
+++ .cvsignore 15 Sep 2008 08:32:05 -0000 1.2
@@ -0,0 +1 @@
+mbpurple-svn148.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/purple-microblog/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 14 Sep 2008 22:21:10 -0000 1.1
+++ sources 15 Sep 2008 08:32:05 -0000 1.2
@@ -0,0 +1 @@
+1b2eef67656c66fb361273f56a317eb1 mbpurple-svn148.tar.gz
- Previous message: [pkgdb] system-config-bind had acl change status
- Next message: rpms/orsa/devel import.log, NONE, 1.1 orsa-configure.patch, NONE, 1.1 orsa-gcc43.patch, NONE, 1.1 orsa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list