cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak after changes in glib2mm 2.49.x.

Browse Source
This commit is contained in:
ajacoutot 2016-10-28 13:46:17 +00:00
parent 8e56bfabb2
commit 3b120d4f21
9 changed files with 202 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/ardour/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2016/03/20 11:58:32 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2016/10/28 13:46:17 ajacoutot Exp $
# XXX check if still needed at next update
CXXFLAGS += -std=c++11
@ -8,7 +8,7 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc
COMMENT = digital audio workstation
DISTNAME = ardour-2.8.16
REVISION = 3
REVISION = 4
CATEGORIES = audio
HOMEPAGE = http://ardour.org
@ -26,7 +26,7 @@ WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkmm-2.4 harfbuzz
WANTLIB += jack lo lrdf m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pangomm-1.4 pcre pixman-1 png pthread pthread-stubs
WANTLIB += samplerate sigc-2.0 sndfile sndio xcb xcb-render
WANTLIB += xcb-shm xml2 xslt z expat graphite2 usb
WANTLIB += xcb-shm xml2 xslt z expat graphite2 usb lzma
# Use mirrors as official site has click-through donation-request download.
MASTER_SITES = http://pkgs.fedoraproject.org/repo/pkgs/ardour/${DISTNAME}${EXTRACT_SUFX}/5bafe41df00d25e7a357baaa1038f16d/

30
audio/ardour/patches/patch-gtk2_ardour_editor_cc Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-gtk2_ardour_editor_cc,v 1.1 2016/10/28 13:46:17 ajacoutot Exp $
From 65c2e089ab263c83bff7d2e945b80c53f80b749b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 4 Aug 2016 09:48:47 +0200
Subject: [PATCH] workaround changes in glibmm 2.49.x
--- gtk2_ardour/editor.cc.orig Fri Oct 28 12:34:10 2016
+++ gtk2_ardour/editor.cc Fri Oct 28 12:35:01 2016
@@ -802,16 +802,16 @@ Editor::Editor ()
list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
Glib::RefPtr<Gdk::Pixbuf> icon;
- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_16px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_22px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_32px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_48px"))) {
window_icons.push_back (icon);
}
if (!window_icons.empty()) {

21
audio/ardour/patches/patch-gtk2_ardour_editor_keyboard_cc Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-gtk2_ardour_editor_keyboard_cc,v 1.1 2016/10/28 13:46:17 ajacoutot Exp $
From 65c2e089ab263c83bff7d2e945b80c53f80b749b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 4 Aug 2016 09:48:47 +0200
Subject: [PATCH] workaround changes in glibmm 2.49.x
--- gtk2_ardour/editor_keyboard.cc.orig Fri Oct 28 13:09:00 2016
+++ gtk2_ardour/editor_keyboard.cc Fri Oct 28 13:10:12 2016
@@ -42,9 +42,9 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot
Glib::RefPtr<Gdk::Window> evw = track_canvas->get_window()->get_pointer (x, y, mask);
bool doit = false;
- if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask) != 0) {
+ if (use_track_canvas && track_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
doit = true;
- } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)!= 0) {
+ } else if (use_time_canvas && time_canvas_event_box.get_window()->get_pointer(x, y, mask)) {
doit = true;
}

27
audio/ardour/patches/patch-gtk2_ardour_fft_graph_cc Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-gtk2_ardour_fft_graph_cc,v 1.1 2016/10/28 13:46:17 ajacoutot Exp $
From 65c2e089ab263c83bff7d2e945b80c53f80b749b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 4 Aug 2016 09:48:47 +0200
Subject: [PATCH] workaround changes in glibmm 2.49.x
--- gtk2_ardour/fft_graph.cc.orig Fri Oct 28 11:31:43 2016
+++ gtk2_ardour/fft_graph.cc Fri Oct 28 13:41:10 2016
@@ -190,7 +190,7 @@ FFTGraph::draw_scales(Glib::RefPtr<Gdk::Window> window
- if (graph_gc == 0) {
+ if (! graph_gc) {
graph_gc = GC::create( get_window() );
}
@@ -200,7 +200,7 @@ FFTGraph::draw_scales(Glib::RefPtr<Gdk::Window> window
graph_gc->set_rgb_fg_color( grey );
- if (layout == 0) {
+ if (! layout) {
layout = create_pango_layout ("");
layout->set_font_description (get_style()->get_font());
}

18
audio/ardour/patches/patch-gtk2_ardour_gain_meter_cc Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gtk2_ardour_gain_meter_cc,v 1.1 2016/10/28 13:46:17 ajacoutot Exp $
From 65c2e089ab263c83bff7d2e945b80c53f80b749b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 4 Aug 2016 09:48:47 +0200
Subject: [PATCH] workaround changes in glibmm 2.49.x
--- gtk2_ardour/gain_meter.cc.orig Fri Oct 28 13:15:13 2016
+++ gtk2_ardour/gain_meter.cc Fri Oct 28 13:15:59 2016
@@ -63,7 +63,7 @@ Glib::RefPtr<Gdk::Pixbuf> GainMeter::slider;
void
GainMeter::setup_slider_pix ()
{
- if ((slider = ::get_icon ("fader_belt")) == 0) {
+ if (! (slider = ::get_icon ("fader_belt"))) {
throw failed_constructor();
}
}

33
audio/ardour/patches/patch-gtk2_ardour_new_session_dialog_cc
View File

@ -1,6 +1,33 @@
$OpenBSD: patch-gtk2_ardour_new_session_dialog_cc,v 1.2 2015/12/17 23:14:52 ajacoutot Exp $
--- gtk2_ardour/new_session_dialog.cc.orig Fri Dec 18 00:14:23 2015
+++ gtk2_ardour/new_session_dialog.cc Fri Dec 18 00:14:23 2015
$OpenBSD: patch-gtk2_ardour_new_session_dialog_cc,v 1.3 2016/10/28 13:46:17 ajacoutot Exp $
From 65c2e089ab263c83bff7d2e945b80c53f80b749b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 4 Aug 2016 09:48:47 +0200
Subject: [PATCH] workaround changes in glibmm 2.49.x
--- gtk2_ardour/new_session_dialog.cc.orig Fri Oct 28 11:31:43 2016
+++ gtk2_ardour/new_session_dialog.cc Fri Oct 28 13:20:13 2016
@@ -354,16 +354,16 @@ NewSessionDialog::NewSessionDialog()
list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
Glib::RefPtr<Gdk::Pixbuf> icon;
- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_16px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_22px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_32px"))) {
window_icons.push_back (icon);
}
- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
+ if ((icon = ::get_icon ("ardour_icon_48px"))) {
window_icons.push_back (icon);
}
if (!window_icons.empty()) {
@@ -582,7 +582,7 @@ NewSessionDialog::set_session_folder(const std::string
*/

18
audio/ardour/patches/patch-gtk2_ardour_panner2d_cc Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gtk2_ardour_panner2d_cc,v 1.1 2016/10/28 13:46:17 ajacoutot Exp $
From 65c2e089ab263c83bff7d2e945b80c53f80b749b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 4 Aug 2016 09:48:47 +0200
Subject: [PATCH] workaround changes in glibmm 2.49.x
--- gtk2_ardour/panner2d.cc.orig Fri Oct 28 13:21:48 2016
+++ gtk2_ardour/panner2d.cc Fri Oct 28 13:21:59 2016
@@ -427,7 +427,7 @@ Panner2d::on_expose_event (GdkEventExpose *event)
gint x, y;
float fx, fy;
- if (layout == 0) {
+ if (! layout) {
layout = create_pango_layout ("");
layout->set_font_description (get_style()->get_font());
}

37
audio/ardour/patches/patch-gtk2_ardour_route_time_axis_cc Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-gtk2_ardour_route_time_axis_cc,v 1.1 2016/10/28 13:46:17 ajacoutot Exp $
From 65c2e089ab263c83bff7d2e945b80c53f80b749b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 4 Aug 2016 09:48:47 +0200
Subject: [PATCH] workaround changes in glibmm 2.49.x
--- gtk2_ardour/route_time_axis.cc.orig Fri Oct 28 13:49:34 2016
+++ gtk2_ardour/route_time_axis.cc Fri Oct 28 13:50:21 2016
@@ -31,7 +31,8 @@
#include <pbd/whitespace.h>
#include <pbd/memento_command.h>
-#include <gtkmm.h>
+#include <gtkmm/menu.h>
+#include <gtkmm/menuitem.h>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/selector.h>
#include <gtkmm2ext/stop_signal.h>
@@ -76,8 +77,6 @@
#include "i18n.h"
-namespace sigc { SIGC_FUNCTORS_HAVE_RESULT_TYPE }
-
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
@@ -90,7 +89,7 @@ Glib::RefPtr<Gdk::Pixbuf> RouteTimeAxisView::slider;
void
RouteTimeAxisView::setup_slider_pix ()
{
- if ((slider = ::get_icon ("fader_belt_h")) == 0) {
+ if (! (slider = ::get_icon ("fader_belt_h"))) {
throw failed_constructor ();
}
}

18
audio/ardour/patches/patch-libs_gtkmm2ext_fastmeter_cc Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-libs_gtkmm2ext_fastmeter_cc,v 1.3 2016/10/28 13:46:17 ajacoutot Exp $
From 65c2e089ab263c83bff7d2e945b80c53f80b749b Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@tiptoe.de>
Date: Thu, 4 Aug 2016 09:48:47 +0200
Subject: [PATCH] workaround changes in glibmm 2.49.x
--- libs/gtkmm2ext/fastmeter.cc.orig Fri Oct 28 11:31:43 2016
+++ libs/gtkmm2ext/fastmeter.cc Fri Oct 28 12:03:26 2016
@@ -475,7 +475,7 @@ FastMeter::set (float lvl)
Glib::RefPtr<Gdk::Window> win;
- if ((win = get_window()) == 0) {
+ if (! (win = get_window())) {
queue_draw ();
return;
}