Skip to content

Commit f47984f

Browse files
authored
[Gnome_themes_extra] Rebuild for AnyPlatform (#1896)
1 parent 5edfea0 commit f47984f

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

G/Gnome_themes_extra/build_tarballs.jl

+13-17
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ version = v"3.28"
77

88
# Collection of sources required to build gnome-themes-extra
99
sources = [
10-
"http://ftp.gnome.org/pub/gnome/sources/gnome-themes-extra/$(version.major).$(version.minor)/gnome-themes-extra-$(version.major).$(version.minor).tar.xz" =>
11-
"7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819",
10+
ArchiveSource("http://ftp.gnome.org/pub/gnome/sources/gnome-themes-extra/$(version.major).$(version.minor)/gnome-themes-extra-$(version.major).$(version.minor).tar.xz",
11+
"7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819"),
1212
]
1313

1414
# Bash recipe for building across all platforms
@@ -19,18 +19,14 @@ apk add intltool
1919
# Clear out `.la` files since they're often wrong and screw us up
2020
rm -f ${prefix}/lib/*.la
2121
22-
FLAGS=()
23-
if [[ "${target}" == *-mingw* ]]; then
24-
FLAGS+=(ac_cv_path_GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache.exe)
25-
fi
22+
# Remove a library from the host filesystem that is accidentally picked up by
23+
# the build when doing a native compilation
24+
rm /usr/lib/libexpat.so.1
2625
27-
if [[ "${target}" == powerpc64le-* ]]; then
28-
export CFLAGS="-Wl,-rpath-link,${prefix}/lib64"
29-
fi
30-
31-
./configure --prefix=${prefix} --host=${target} \
32-
--disable-gtk2-engine \
33-
"${FLAGS[@]}"
26+
./configure --prefix=${prefix} \
27+
--build=${MACHTYPE} \
28+
--host=${target} \
29+
--disable-gtk2-engine
3430
make -j${nproc}
3531
make install
3632
"""
@@ -41,7 +37,7 @@ make install
4137
#platforms = supported_platforms()
4238

4339
# Limit to the same platforms as Gtk for now
44-
platforms = supported_platforms()
40+
platforms = [AnyPlatform()]
4541

4642
# The products that we will ensure are always built
4743
products = [
@@ -50,10 +46,10 @@ products = [
5046

5147
# Dependencies that must be installed before this package can be built
5248
dependencies = [
53-
"GTK3_jll",
54-
"Librsvg_jll",
49+
BuildDependency("Xorg_xorgproto_jll"),
50+
Dependency("GTK3_jll"),
51+
Dependency("Librsvg_jll"),
5552
]
5653

5754
# Build the tarballs, and possibly a `build.jl` as well.
5855
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies)
59-

0 commit comments

Comments
 (0)