Attachment 99552 Details for Bug 138641 – file.diff

[patch] file.diff

file.diff (text/plain), 5.24 KB, created by Henrik Friedrichsen on 2009-09-08 21:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Henrik Friedrichsen

Created: 2009-09-08 21:30:01 UTC

Size: 5.24 KB

patch

obsolete

>diff -Naur ./Makefile ../pidgin-msn-pecan/Makefile
>--- ./Makefile	2009-09-08 21:56:43.000000000 +0200
>+++ ../pidgin-msn-pecan/Makefile	2009-09-08 22:08:21.000000000 +0200
>@@ -6,11 +6,11 @@
> #
> 
> PORTNAME=	msn-pecan
>-PORTVERSION=	0.0.19
>-PORTREVISION=	1
>+PORTVERSION=	0.1.0.r1
> CATEGORIES=	net-im
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
> PKGNAMEPREFIX=	pidgin-
>+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
> 
> MAINTAINER=	hrkfdn@gmail.com
> COMMENT=	Alternative MSN protocol plugin for libpurple
>diff -Naur ./distinfo ../pidgin-msn-pecan/distinfo
>--- ./distinfo	2009-09-08 21:56:43.000000000 +0200
>+++ ../pidgin-msn-pecan/distinfo	2009-09-08 22:08:26.000000000 +0200
>@@ -1,3 +1,3 @@
>-MD5 (msn-pecan-0.0.19.tar.bz2) = c21fabd92473dc7fe80d46e8660063a7
>-SHA256 (msn-pecan-0.0.19.tar.bz2) = f06bebffa4ed7eca8336437444c6fc0812499266eefe3c6afd48114442483f84
>-SIZE (msn-pecan-0.0.19.tar.bz2) = 182250
>+MD5 (msn-pecan-0.1.0-rc1.tar.bz2) = 67686d16ff1cb7410a374c231931512d
>+SHA256 (msn-pecan-0.1.0-rc1.tar.bz2) = c788fab679c0151103c430de96268e8414c59a0b5416b67484cdadf939712bba
>+SIZE (msn-pecan-0.1.0-rc1.tar.bz2) = 235687
>diff -Naur ./files/patch-Makefile ../pidgin-msn-pecan/files/patch-Makefile
>--- ./files/patch-Makefile	2009-09-08 21:56:43.000000000 +0200
>+++ ../pidgin-msn-pecan/files/patch-Makefile	2009-09-08 22:18:02.000000000 +0200
>@@ -1,25 +1,16 @@
>---- Makefile.orig	2009-06-16 08:23:23.000000000 +0900
>-+++ Makefile	2009-06-28 01:25:58.549210758 +0900
>-@@ -17,8 +17,8 @@
>- LIBSIREN := y
>- PLUS_SOUNDS := y
>- DEBUG := y
>- 
>--CFLAGS := -O2
>-+#CFLAGS := -O2
>- 
>- ifdef DEBUG
>-   CFLAGS += -ggdb
>-@@ -34,7 +34,7 @@
>+diff -Naur ./Makefile ../msn-pecan-0.1.0-rc1/Makefile
>+--- ./Makefile	2009-09-08 22:14:07.000000000 +0200
>++++ ../msn-pecan-0.1.0-rc1/Makefile	2009-09-08 22:17:43.000000000 +0200
>+@@ -41,7 +41,7 @@
>  OTHER_WARNINGS := -D_FORTIFY_SOURCE=2 -fstack-protector -g3 -Wdisabled-optimization \
>  	-Wendif-labels -Wformat=2 -Wstack-protector -Wswitch
>  
> -CFLAGS += -Wall # $(EXTRA_WARNINGS)
>-+CFLAGS += -Wall -I$(LOCALBASE)/include # $(EXTRA_WARNINGS)
>++CFLAGS += -Wall -I${LOCALBASE}/include # $(EXTRA_WARNINGS)
>  
>- override CFLAGS += -I. -D GETTEXT_PACKAGE='"libmsn-pecan"' -DENABLE_NLS -DHAVE_LIBPURPLE -DPURPLE_DEBUG -D PLUGIN_NAME='msn-pecan'
>- 
>-@@ -61,7 +61,7 @@
>+ override CFLAGS += -D_XOPEN_SOURCE
>+ override CFLAGS += -I. -DENABLE_NLS -DHAVE_LIBPURPLE -DPURPLE_DEBUG
>+@@ -74,7 +74,7 @@
>  # For glib < 2.6 support (libpurple maniacs)
>  FALLBACK_CFLAGS := -I./fix_purple
>  
>@@ -28,12 +19,12 @@
>  
>  plugin_dir := $(DESTDIR)/$(PURPLE_LIBDIR)/purple-2
>  data_dir := $(DESTDIR)/$(PURPLE_DATADIR)
>-@@ -235,7 +235,7 @@
>+@@ -263,7 +263,7 @@
>  
>- install_locales: $(foreach e,$(CATALOGS),po/libmsn-pecan-$(e).mo)
>+ install_locales: $(foreach e,$(CATALOGS),po/$(e).mo)
>  	for x in $(CATALOGS); do \
>--	install -D po/libmsn-pecan-$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
>-+	install -m 0444 po/libmsn-pecan-$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
>+-	install -D po/$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
>++	install -m 0444 po/$$x.mo $(data_dir)/locale/$$x/LC_MESSAGES/libmsn-pecan.mo; \
>  	done
>  
>  -include $(deps)
>diff -Naur ./files/patch-io-pecan_http_server.h ../pidgin-msn-pecan/files/patch-io-pecan_http_server.h
>--- ./files/patch-io-pecan_http_server.h	2009-09-08 21:56:43.000000000 +0200
>+++ ../pidgin-msn-pecan/files/patch-io-pecan_http_server.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- io/pecan_http_server.h.orig	2009-06-16 08:23:23.000000000 +0900
>-+++ io/pecan_http_server.h	2009-06-28 01:29:06.320366241 +0900
>-@@ -20,6 +20,7 @@
>- #define PECAN_HTTP_SERVER_H
>- 
>- #include <glib-object.h>
>-+#include <libpurple/proxy.h>
>- 
>- typedef struct PecanHttpServer PecanHttpServer;
>- 
>diff -Naur ./files/patch-io-pecan_node.h ../pidgin-msn-pecan/files/patch-io-pecan_node.h
>--- ./files/patch-io-pecan_node.h	2009-09-08 21:56:43.000000000 +0200
>+++ ../pidgin-msn-pecan/files/patch-io-pecan_node.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- io/pecan_node.h.orig	2009-06-16 08:23:23.000000000 +0900
>-+++ io/pecan_node.h	2009-06-28 01:28:58.352985730 +0900
>-@@ -20,6 +20,7 @@
>- #define PECAN_NODE_H
>- 
>- #include <glib-object.h>
>-+#include <libpurple/proxy.h>
>- 
>- typedef struct PecanNode PecanNode;
>- 
>diff -Naur ./files/patch-io-pecan_ssl_conn.h ../pidgin-msn-pecan/files/patch-io-pecan_ssl_conn.h
>--- ./files/patch-io-pecan_ssl_conn.h	2009-09-08 21:56:43.000000000 +0200
>+++ ../pidgin-msn-pecan/files/patch-io-pecan_ssl_conn.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- io/pecan_ssl_conn.h.orig	2009-06-16 08:23:23.000000000 +0900
>-+++ io/pecan_ssl_conn.h	2009-06-28 01:25:04.495846164 +0900
>-@@ -20,6 +20,7 @@
>- #define PECAN_SSL_CONN_H
>- 
>- #include <glib-object.h>
>-+#include <libpurple/sslconn.h>
>- 
>- #include "io/pecan_node.h"
>- 
>diff -Naur ./pkg-plist ../pidgin-msn-pecan/pkg-plist
>--- ./pkg-plist	2009-09-08 21:56:43.000000000 +0200
>+++ ../pidgin-msn-pecan/pkg-plist	2009-09-08 22:20:20.000000000 +0200
>@@ -4,6 +4,7 @@
> share/locale/de/LC_MESSAGES/libmsn-pecan.mo
> share/locale/es/LC_MESSAGES/libmsn-pecan.mo
> share/locale/fi/LC_MESSAGES/libmsn-pecan.mo
>+share/locale/fr/LC_MESSAGES/libmsn-pecan.mo
> share/locale/hu/LC_MESSAGES/libmsn-pecan.mo
> share/locale/it/LC_MESSAGES/libmsn-pecan.mo
> share/locale/nb/LC_MESSAGES/libmsn-pecan.mo

Actions: View | Diff

Attachments on bug 138641: 99552