Skip to content
This repository has been archived by the owner on Jun 28, 2021. It is now read-only.

Commit

Permalink
2020-10
Browse files Browse the repository at this point in the history
  • Loading branch information
aosync committed Oct 10, 2020
1 parent 3c7d5db commit 121e091
Show file tree
Hide file tree
Showing 11 changed files with 123 additions and 77 deletions.
71 changes: 71 additions & 0 deletions ungoogled-chromium-bin-prep/build
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#!/bin/sh -e

# libatspi requires patching to build because alignment check doesn't work automatically
patch -p1 < ./1-meson.build.patch

# Tell meson to check for .pc files here
export PKG_CONFIG_PATH="$PWD"

# Build and install the stub
(
cd libdbus-stub
make
)
cp libdbus-stub/libdbus-1.so ./libdbus-1.so.3


# Create PC files to satisfy meson
cat <<EOF > dbus-1.pc
Name: dbus
Description: Free desktop message bus
Version: 1.13.18
Libs: -L$PWD -l:libdbus-1.so.3
Libs.private:
Cflags: -I$PWD/libdbus-stub
EOF

cat <<EOF > atspi-2.pc
Name: atspi
Description: Accessibility Technology software library
Version: 2.36.0
Requires: dbus-1 glib-2.0
Requires.private: dbus-1 >= 1.5, gobject-2.0 >= 2.0.0, glib-2.0 >= 2.32.0, x11, xtst, xi
Libs: -L$PWD -l:libatspi.so.0
Cflags: -I$PWD/at-spi2-core
EOF

# Build atspi
(
cd at-spi2-core
./as2cbuild
cp build/atspi/*.h atspi/
)
cp at-spi2-core/build/atspi/libatspi.so ./libatspi.so.0
ln -s libatspi.so.0 ./libatspi.so

# Build atk-bridge
(
cd atk-bridge
./atkbbuild
)
cp atk-bridge/build/atk-adaptor/libatk-bridge-2.0.so.0.0.0 ./libatk-bridge-2.0.so.0

# libintl is provided by our musl
patchelf --remove-needed libintl.so.8 ./chrome

# Use shipped .so's
patchelf --set-rpath '$ORIGIN' ./chrome
patchelf --set-rpath '$ORIGIN' ./libatspi.so.0
patchelf --set-rpath '$ORIGIN' ./libatk-bridge-2.0.so.0

# Symlink the system libpci.so.3.x.y to directory due to a bug in the pciutils package (temporary)
ln -s /usr/lib/libpci.so.3.* ./libpci.so.3

# Clean now useless stuff
rm -Rf at-spi2-core atk-bridge libdbus-stub 1-meson.build.patch *.pc

mkdir -p "$1/usr/lib"
mkdir -p "$1/usr/bin"

cp -R "$PWD" "$1/usr/lib/chromium"
ln -s /usr/lib/chromium/chrome "$1/usr/bin/chromium"
File renamed without changes.
42 changes: 42 additions & 0 deletions ungoogled-chromium-bin-prep/depends
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
alsa-lib
atk
bzip2
cairo
cups
eudev
expat
fontconfig
freetype-harfbuzz
fribidi
gdk-pixbuf
glib
gtk+3
libX11
libXScrnSaver
libXau
libXcomposite
libXcursor
libXdamage
libXext
libXfixes
libXi
libXinerama
libXrandr
libXrender
libXtst
libXxf86vm
libdrm
libepoxy
libffi
libjpeg-turbo
libpng
libxcb
libxshmfence
mesa
nss
pango
pciutils
pixman
util-linux
zlib
patchelf make
7 changes: 7 additions & 0 deletions ungoogled-chromium-bin-prep/sources
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
https://github.com/Cubified/ungoogled-chromium-binaries/releases/download/84.0.4147.135-1.musl1/ungoogled-chromium_84.0.4147.135-1.musl1_linux.tar.xz
git+https://github.com/dylanaraps/libdbus-stub.git libdbus-stub
http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.tar.xz at-spi2-core
http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.tar.xz atk-bridge
files/as2cbuild at-spi2-core
files/1-meson.build.patch
files/atkbbuild atk-bridge
1 change: 1 addition & 0 deletions ungoogled-chromium-bin-prep/version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
84.0.4147.135-1.musl1 6
70 changes: 1 addition & 69 deletions ungoogled-chromium-bin/build
Original file line number Diff line number Diff line change
@@ -1,71 +1,3 @@
#!/bin/sh -e

# libatspi requires patching to build because alignment check doesn't work automatically
patch -p1 < ./1-meson.build.patch

# Tell meson to check for .pc files here
export PKG_CONFIG_PATH="$PWD"

# Build and install the stub
(
cd libdbus-stub
make
)
cp libdbus-stub/libdbus-1.so ./libdbus-1.so.3


# Create PC files to satisfy meson
cat <<EOF > dbus-1.pc
Name: dbus
Description: Free desktop message bus
Version: 1.13.18
Libs: -L$PWD -l:libdbus-1.so.3
Libs.private:
Cflags: -I$PWD/libdbus-stub
EOF

cat <<EOF > atspi-2.pc
Name: atspi
Description: Accessibility Technology software library
Version: 2.36.0
Requires: dbus-1 glib-2.0
Requires.private: dbus-1 >= 1.5, gobject-2.0 >= 2.0.0, glib-2.0 >= 2.32.0, x11, xtst, xi
Libs: -L$PWD -l:libatspi.so.0
Cflags: -I$PWD/at-spi2-core
EOF

# Build atspi
(
cd at-spi2-core
./as2cbuild
cp build/atspi/*.h atspi/
)
cp at-spi2-core/build/atspi/libatspi.so ./libatspi.so.0
ln -s libatspi.so.0 ./libatspi.so

# Build atk-bridge
(
cd atk-bridge
./atkbbuild
)
cp atk-bridge/build/atk-adaptor/libatk-bridge-2.0.so.0.0.0 ./libatk-bridge-2.0.so.0

# libintl is provided by our musl
patchelf --remove-needed libintl.so.8 ./chrome

# Use shipped .so's
patchelf --set-rpath '$ORIGIN' ./chrome
patchelf --set-rpath '$ORIGIN' ./libatspi.so.0
patchelf --set-rpath '$ORIGIN' ./libatk-bridge-2.0.so.0

# Symlink the system libpci.so.3.x.y to directory due to a bug in the pciutils package (temporary)
ln -s /usr/lib/libpci.so.3.* ./libpci.so.3

# Clean now useless stuff
rm -Rf at-spi2-core atk-bridge libdbus-stub 1-meson.build.patch *.pc

mkdir -p "$1/usr/lib"
mkdir -p "$1/usr/bin"

cp -R "$PWD" "$1/usr/lib/chromium"
ln -s /usr/lib/chromium/chrome "$1/usr/bin/chromium"
cp -r usr "$1/usr"
1 change: 0 additions & 1 deletion ungoogled-chromium-bin/depends
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ pciutils
pixman
util-linux
zlib
patchelf make
8 changes: 1 addition & 7 deletions ungoogled-chromium-bin/sources
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
https://github.com/Cubified/ungoogled-chromium-binaries/releases/download/84.0.4147.135-1.musl1/ungoogled-chromium_84.0.4147.135-1.musl1_linux.tar.xz
git+https://github.com/dylanaraps/libdbus-stub.git libdbus-stub
http://ftp.gnome.org/pub/gnome/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.tar.xz at-spi2-core
http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.tar.xz atk-bridge
files/as2cbuild at-spi2-core
files/1-meson.build.patch
files/atkbbuild atk-bridge

0 comments on commit 121e091

Please sign in to comment.