Attachment 151298 Details for Bug 192571 – Patch against r373636

[patch] Patch against r373636

patch-r373636 (text/plain), 5.31 KB, created by Romain Tartière on 2015-01-03 19:04:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Romain Tartière

Created: 2015-01-03 19:04:07 UTC

Size: 5.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 376146)
>+++ Makefile	(copie de travail)
>@@ -2,24 +2,39 @@
> # $FreeBSD$
> 
> PORTNAME=	pavucontrol
>-PORTVERSION=	0.9.10
>-PORTREVISION=	3
>+PORTVERSION=	2.0
> CATEGORIES=	audio
>-MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
>+MASTER_SITES=	http://freedesktop.org/software/pulseaudio/${PORTNAME}/
> 
> MAINTAINER=	romain@FreeBSD.org
> COMMENT=	GTK mixer for PulseAudio
> 
>-LIB_DEPENDS=	libglademm-2.4.so:${PORTSDIR}/devel/libglademm24 \
>-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
>-		libcanberra.so:${PORTSDIR}/audio/libcanberra
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
>+
> GNU_CONFIGURE=	yes
>-USES=		gettext gmake pkgconfig
>-USE_GNOME=	intltool
>+USES=		gettext gmake pkgconfig tar:xz
>+USE_GNOME=	glibmm intltool libsigc++20
> 
>+OPTIONS_SUB=	yes
>+OPTIONS_SINGLE=	GTK
>+OPTIONS_SINGLE_GTK=GTK2 GTK3
>+OPTIONS_DEFAULT=GTK2
>+
> CONFIGURE_ARGS=	--disable-lynx
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib
> 
>+GTK2_USE=	GNOME=gtkmm24
>+GTK2_LIB_DEPENDS=libcanberra.so:${PORTSDIR}/audio/libcanberra
>+GTK2_CONFIGURE_ON=--disable-gtk3
>+
>+GTK3_USE=	GNOME=gtkmm30
>+GTK3_LIB_DEPENDS=libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
>+
>+post-patch:
>+# Install locales files in right place
>+	${REINPLACE_CMD} -e 's|[$$][(]DATADIRNAME[)]|share|' \
>+		${WRKSRC}/po/Makefile.in.in
>+
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(rÃ©vision 376146)
>+++ distinfo	(copie de travail)
>@@ -1,2 +1,2 @@
>-SHA256 (pavucontrol-0.9.10.tar.gz) = 7ee96d2ddc28f53e392a1bc51a7316d2a9087ea2ad18e611f6f6725e756a5a3c
>-SIZE (pavucontrol-0.9.10.tar.gz) = 227735
>+SHA256 (pavucontrol-2.0.tar.xz) = 22f29dd81b4a1a34ec7bffe9b027aff2a37fc76ccded4539d43a8c126a39470b
>+SIZE (pavucontrol-2.0.tar.xz) = 151560
>Index: files/patch-src__devicewidget.cc
>===================================================================
>--- files/patch-src__devicewidget.cc	(rÃ©vision 0)
>+++ files/patch-src__devicewidget.cc	(copie de travail)
>@@ -0,0 +1,20 @@
>+From: Alam Arias <alam.gbc@gmail.com>
>+Date: Fri, 8 Mar 2013 14:27:02 -0500
>+Subject: added back support for gtkmm-2.4 builds
>+
>+--- ./src/devicewidget.cc.orig	2012-12-17 09:50:42.000000000 +0000
>++++ ./src/devicewidget.cc	2014-08-12 18:56:20.000000000 +0000
>+@@ -63,8 +63,13 @@
>+     for (unsigned i = 0; i < PA_CHANNELS_MAX; i++)
>+         channelWidgets[i] = NULL;
>+ 
>++#ifdef HAVE_GTK3
>+     offsetAdjustment = Gtk::Adjustment::create(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
>+     offsetButton->configure(offsetAdjustment, 0, 2);
>++#else
>++    offsetAdjustment = new Gtk::Adjustment(0.0, -2000.0, 2000.0, 10.0, 50.0, 0.0);
>++    offsetButton->configure(*offsetAdjustment, 0.0, 2);
>++#endif  /* HAVE_GTK3 */
>+ }
>+ 
>+ void DeviceWidget::init(MainWindow* mainWindow, Glib::ustring deviceType) {
>
>Modification de propriÃ©tÃ©s sur files/patch-src__devicewidget.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src__devicewidget.h
>===================================================================
>--- files/patch-src__devicewidget.h	(rÃ©vision 0)
>+++ files/patch-src__devicewidget.h	(copie de travail)
>@@ -0,0 +1,18 @@
>+From: Alam Arias <alam.gbc@gmail.com>
>+Date: Fri, 8 Mar 2013 14:27:02 -0500
>+Subject: added back support for gtkmm-2.4 builds
>+
>+--- ./src/devicewidget.h.orig	2012-12-17 09:17:56.000000000 +0000
>++++ ./src/devicewidget.h	2014-08-12 18:56:20.000000000 +0000
>+@@ -98,7 +98,11 @@
>+     Gtk::HBox *portSelect, *offsetSelect;
>+     Gtk::ComboBox *portList;
>+     Glib::RefPtr<Gtk::ListStore> treeModel;
>++#ifdef HAVE_GTK3
>+     Glib::RefPtr<Gtk::Adjustment> offsetAdjustment;
>++#else
>++    Gtk::Adjustment *offsetAdjustment;
>++#endif /* HAVE_GTK3 */
>+ 
>+ private:
>+     Glib::ustring mDeviceType;
>
>Modification de propriÃ©tÃ©s sur files/patch-src__devicewidget.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(rÃ©vision 376146)
>+++ pkg-descr	(copie de travail)
>@@ -3,4 +3,4 @@
> tools this one allows you to control both the volume of hardware devices and of
> each playback stream separately.
> 
>-WWW: http://0pointer.de/lennart/projects/pavucontrol/
>+WWW: http://freedesktop.org/software/pulseaudio/pavucontrol/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(rÃ©vision 376146)
>+++ pkg-plist	(copie de travail)
>@@ -1,8 +1,8 @@
> bin/pavucontrol
> share/applications/pavucontrol.desktop
>-share/doc/pavucontrol/README
>-share/doc/pavucontrol/README.html
>-share/doc/pavucontrol/style.css
>+%%DOCSDIR%%/README
>+%%DOCSDIR%%/README.html
>+%%DOCSDIR%%/style.css
> share/locale/as/LC_MESSAGES/pavucontrol.mo
> share/locale/bn_IN/LC_MESSAGES/pavucontrol.mo
> share/locale/ca/LC_MESSAGES/pavucontrol.mo

Actions: View | Diff

Attachments on bug 192571: 145648 | 146085 | 151298 | 151306