[PR PATCH] revert changes for flac rebuild

[PR PATCH] revert changes for flac rebuild

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

There is a new pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages revert-reorder
https://github.com/void-linux/void-packages/pull/47157

revert changes for flac rebuild
[ci skip]

merge after native builds have finished. hopefully everything goes without a hitch then


A patch file from https://github.com/void-linux/void-packages/pull/47157.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-revert-reorder-47157.patch --]
[-- Type: text/x-diff, Size: 6488 bytes --]

From c531016eb9fdf92d14953278a1d865c92b6eb7f5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 11 Nov 2023 01:27:47 -0500
Subject: [PATCH 1/6] Revert "kitty: broken for now"

This reverts commit c1e4496c269d82140a8e0e64a3f764ac937cf3d7.
---
 srcpkgs/kitty/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 3d09fcdf6fac0..0b885295bf869 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -20,7 +20,6 @@ distfiles="https://github.com/kovidgoyal/kitty/releases/download/v${version}/kit
 checksum=d122497134abab8e25dfcb6b127af40cfe641980e007f696732f70ed298198f5
 python_version=3
 nopie_files="/usr/bin/kitten"
-broken="temp for flac"
 
 LDFLAGS+=" -Wl,-z,stack-size=2097152"
 

From 1814566c7bd4750f96bcc3fba67b530cbcee36ba Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 11 Nov 2023 01:27:55 -0500
Subject: [PATCH 2/6] Revert "OpenRCT2: broken for now"

This reverts commit 513bfc1879a132acc605028e210bf81c17088494.
---
 srcpkgs/OpenRCT2/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 5e5f53f0bd36b..064d66e478f7d 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -51,7 +51,6 @@ skip_extraction="objects.zip
  openmusic.zip
  replays.zip
  title-sequences.zip"
-broken="temp for flac"
 
 replaces="OpenRCT2-data>=0"
 

From 84749e3a024ffaa0e71bf98a9be6984795a78335 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 11 Nov 2023 01:28:00 -0500
Subject: [PATCH 3/6] Revert "gqrx: broken for now"

This reverts commit 456ad5f30a3b086bdbd16e08a88cabd6fd7523f3.
---
 srcpkgs/gqrx/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/gqrx/template b/srcpkgs/gqrx/template
index adea771559380..ccf41d0e87b45 100644
--- a/srcpkgs/gqrx/template
+++ b/srcpkgs/gqrx/template
@@ -16,7 +16,6 @@ homepage="https://gqrx.dk"
 changelog="https://raw.githubusercontent.com/gqrx-sdr/gqrx/master/resources/news.txt"
 distfiles="https://github.com/gqrx-sdr/gqrx/archive/v${version}.tar.gz"
 checksum=7bb7e6a490d7d4669a4d1596ad52f5af08e7167d78117b3d1fd711a368536855
-broken="temp for flac rebuild"
 
 build_options="gr_audio portaudio"
 vopt_conflict gr_audio portaudio

From 66a9ca0f286868d4df28bad321b3c77fb64a6b0d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 11 Nov 2023 01:28:03 -0500
Subject: [PATCH 4/6] Revert "chromium: broken for now"

This reverts commit d0c975a3b8a022a2444fa94d69734484c0232718.
---
 srcpkgs/chromium/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 42ee4b947008f..65e6dcac5bff2 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -20,7 +20,7 @@ makedepends="
  xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
  $(vopt_if pipewire pipewire-devel)
  $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if sndio sndio-devel)"
+ $(vopt_if sndio sndio-devel) libsndfile"
 depends="desktop-file-utils hicolor-icon-theme hwids xdg-utils"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -28,7 +28,6 @@ license="BSD-3-Clause"
 homepage="https://www.chromium.org/"
 distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
 checksum=73cb8c39e928f8c627d747d37a3b020f08913ef5508f893758d70bdbd545dbcf
-broken="temp for flac build order"
 
 lib32disabled=yes
 

From 326c0c6ad9d2c9fd85055b8b6c32999d09eacc00 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 11 Nov 2023 01:28:06 -0500
Subject: [PATCH 5/6] Revert "chromium: fix build order"

This reverts commit 4411c1cb709deafc61f74ff992d3b94fc532b5fc.
---
 srcpkgs/chromium/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 65e6dcac5bff2..b023946f3ec7b 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -20,7 +20,7 @@ makedepends="
  xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
  $(vopt_if pipewire pipewire-devel)
  $(vopt_if pulseaudio pulseaudio-devel)
- $(vopt_if sndio sndio-devel) libsndfile"
+ $(vopt_if sndio sndio-devel)"
 depends="desktop-file-utils hicolor-icon-theme hwids xdg-utils"
 short_desc="Google's attempt at creating a safer, faster, and more stable browser"
 maintainer="Duncaen <duncaen@voidlinux.org>"

From 2623360943ab54988d6d269fa9d15791f123124f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 11 Nov 2023 01:28:09 -0500
Subject: [PATCH 6/6] Revert "gtkpod, gst-plugins-good1: fix build order"

This reverts commit f863767999bc86edd4540f19eb188c609c8f9156.
This partially reverts commit 5f294d24615290234d1af62bb219b489692b890b.
---
 srcpkgs/gst-plugins-good1/template | 2 +-
 srcpkgs/gtkpod/template            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template
index f14f20ac4b6ce..12546fc0daf16 100644
--- a/srcpkgs/gst-plugins-good1/template
+++ b/srcpkgs/gst-plugins-good1/template
@@ -15,7 +15,7 @@ makedepends="
  v4l-utils-devel jack-devel speex-devel libvpx-devel lame-devel
  mpg123-devel twolame-devel qt5-devel qt5-declarative-devel
  qt5-x11extras-devel $(vopt_if wayland qt5-wayland-devel)
- $(vopt_if gtk3 gtk+3-devel) libsndfile"
+ $(vopt_if gtk3 gtk+3-devel)"
 depends="gst-plugins-base1>=${version}"
 short_desc="GStreamer set of well-maintained good plug-ins (1.x)"
 maintainer="Orphaned <orphan@voidlinux.org>"
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 4de38de0be924..4716a3e9b3fab 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -7,8 +7,7 @@ configure_args="--disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
- libid3tag-devel faad2-devel gst-plugins-base1-devel gdl-devel anjuta-devel
- gst-plugins-good1"
+ libid3tag-devel faad2-devel gst-plugins-base1-devel gdl-devel anjuta-devel"
 short_desc="Platform independent GUI for Apple's iPod using GTK3"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"

Re: [PR PATCH] [Merged]: revert changes for flac rebuild

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

There's a merged pull request on the void-packages repository

revert changes for flac rebuild
https://github.com/void-linux/void-packages/pull/47157

Description:
[ci skip]

merge after native builds have finished. hopefully everything goes without a hitch then