diff --git a/build-jack2.sh b/build-jack2.sh index 9d6671e..2acd320 100755 --- a/build-jack2.sh +++ b/build-jack2.sh @@ -139,7 +139,9 @@ if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then qjackctl_CMAKE_PREFIX_PATH="${PAWPAW_PREFIX}/lib/cmake" fi - QJACKCTL_EXTRAFLAGS="-DCONFIG_ALSA_SEQ:BOOL=ON" + QJACKCTL_EXTRAFLAGS="-DJack_ROOT=${jack2_prefix}${jack2_extra_prefix}" + QJACKCTL_EXTRAFLAGS+=" -DCONFIG_ALSA_SEQ:BOOL=ON" + QJACKCTL_EXTRAFLAGS+=" -DCONFIG_DBUS:BOOL=ON" QJACKCTL_EXTRAFLAGS+=" -DCMAKE_PREFIX_PATH=${qjackctl_CMAKE_PREFIX_PATH}" QJACKCTL_EXTRAFLAGS+=" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" diff --git a/patches/glib/01_skip-gettext.patch b/patches/glib/01_skip-gettext.patch index f4cc661..c977e33 100644 --- a/patches/glib/01_skip-gettext.patch +++ b/patches/glib/01_skip-gettext.patch @@ -130,7 +130,7 @@ diff --git a/glib/gi18n.h b/glib/gi18n.h index f765c3d..a06507f 100644 --- a/glib/gi18n.h +++ b/glib/gi18n.h -@@ -20,13 +20,15 @@ +@@ -20,13 +20,16 @@ #include @@ -146,5 +146,6 @@ index f765c3d..a06507f 100644 +#define textdomain(...) +#define bindtextdomain(...) ++#define bind_textdomain_codeset(...) + #endif /* __G_I18N_H__ */