Skip to content

Commit

Permalink
2024.07.24: Welcome back PKGUPD (#217)
Browse files Browse the repository at this point in the history
- platform: define system components
- components/expat: updated 2.6.0 -> 2.6.2
- components/appimaged: updated 646 -> 840
- components/nvidia: updated 550.54.14 -> 555.58.02
- components/wmenu.yml: updated to 1.0.9
- platform: added webkitgtk on platform
- platform: added openjdk-jre and dotnet-runtime
- platform: added epdfview for PDF
  • Loading branch information
itsManjeet authored Jul 27, 2024
1 parent 86f6fe1 commit 2b2ce53
Show file tree
Hide file tree
Showing 72 changed files with 845 additions and 407 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: rm -rf files/sign-keys && cp -r ${SIGN_KEYS_PATH} files/sign-keys

- name: Build system packages
run: make ELEMENT=system/deps.yml
run: make ELEMENT=platform.yml

- name: Write changelog
run: echo "${{ github.event.head_commit.message }}" > ChangeLog
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ $(OSTREE_GPG)/key-config:
files/rlxos.gpg: $(OSTREE_GPG)/key-config
gpg --homedir=$(OSTREE_GPG) --export --armor >"$@"

update-app-market: $(PKGUPD) version.yml ostree-branch.yml channel.yml
update-app-market: $(PKGUPD) version.yml ostree-branch.yml channel.yml
$(PKGUPD) ignite meta ignite.cache=$(CACHE_PATH) $(APPMARKET_PATH)/$(CHANNEL)
./scripts/extract-icons.sh $(APPMARKET_PATH)/$(CHANNEL)/apps/ $(APPMARKET_PATH)/$(CHANNEL)/icons/

update-ostree: files/rlxos.gpg
update-ostree: $(PKGUPD) version.yml ostree-branch.yml channel.yml files/rlxos.gpg
ifndef ELEMENT
@echo "no ELEMENT specified"
@exit 1
Expand Down
2 changes: 2 additions & 0 deletions TODO.ELEMENTS
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
components/rustc: update to latest version for firefox

components/gcr.yml: check and fix update url version
components/gcr.yml: fix documentation
components/qt.yml: fix configuration files
Expand Down
25 changes: 25 additions & 0 deletions elements/components/apache-ant.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
id: apache-ant
version: 1.10.14
about: The Apache Ant package is a Java-based build tool

script: |-
export JAVA_HOME=%{libdir}/openjdk
export PATH=$PATH:$JAVA_HOME/bin
./bootstrap.sh
./bootstrap/bin/ant -f fetch.xml -Ddest=optional
./build.sh -Ddist.dir=%{install-root}%{libdir}/apache-ant
install -vDm0755 /dev/stdin %{install-root}/%{sysconfdir}/profile.d/apache-ant.sh << "EOF"
export PATH=$PATH:%{libdir}/apache-ant/bin
export ANT_HOME=%{libdir}/apache-ant
EOF
depends:
- components/openjdk.yml
- components/glib.yml

sources:
- https://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.xz
2 changes: 1 addition & 1 deletion elements/components/appimaged.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
id: appimaged
version: 647
version: 840
about: AppImage Integration tool
commit: ecf2c87e7021bb1bd222de73e2b1dde067cbcc89

Expand Down
20 changes: 20 additions & 0 deletions elements/components/bspwm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
id: bspwm
version: 0.9.10
about: Tiling window manager based on binary space partitioning

script: |-
export CFLAGS+=' -fcommon'
make PREFIX=%{prefix}
make PREFIX=%{prefix} DESTDIR=%{install-root} install
install -Dm644 LICENSE %{install-root}%{datadir}/licenses/bspwm/LICENSE
depends:
- components/x11/xcb-util.yml
- components/x11/xcb-util-keysyms.yml
- components/x11/xcb-util-wm.yml

sources:
- bspwm-%{version}.tar.gz::https://github.com/baskerville/bspwm/archive/refs/tags/%{version}.tar.gz
6 changes: 6 additions & 0 deletions elements/components/ca-certificates-java.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
id: components/ca-certificates-java
version: 20240726
about: hooks of the ca-certificates package to update the cacerts JKS keystore used for many java runtimes

depends:
- components/ca-certificates.yml
2 changes: 1 addition & 1 deletion elements/components/cbindgen.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
id: cbindgen
version: 0.25.0
version: 0.26.0
about: Cbindgen can be used to generate C bindings for Rust code

depends:
Expand Down
21 changes: 21 additions & 0 deletions elements/components/clucene.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
id: clucene
version: 2.3.3.4
about: CLucene is a C++ version of Lucene, a high performance text search engine

pre-script: |-
patch -Np1 -i clucene-%{version}-contribs_lib-1.patch
sed -i '/Misc.h/a #include <ctime>' src/core/CLucene/document/DateTools.cpp
configure: >-
-D BUILD_CONTRIBS_LIB=ON
depends:
- components/libboost.yml

build-depends:
- components/boost.yml
- components/cmake.yml

sources:
- https://downloads.sourceforge.net/clucene/clucene-core-%{version}.tar.gz
- patches/clucene/clucene-%{version}-contribs_lib-1.patch
85 changes: 0 additions & 85 deletions elements/components/desktop-shell.yml

This file was deleted.

3 changes: 3 additions & 0 deletions elements/components/dialog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ configure: >
install: install-full

post-script: |-
install -vDm 0644 /files/dialogrc -t %{install-root}%{sysconfdir}/
depends:
- components/ncurses.yml
- components/libtool.yml
Expand Down
16 changes: 16 additions & 0 deletions elements/components/epdfview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
id: epdfview
version: 20200814
about: Lightweight PDF document viewer

configure: >-
-Denable-printing=true
depends:
- components/gtk.yml
- components/poppler.yml
- components/cups.yml
- components/desktop-file-utils.yml
- components/hicolor-icon-theme.yml

sources:
- https://anduin.linuxfromscratch.org/BLFS/epdfview-gtk3/epdfview-gtk3-%{version}.tar.xz
4 changes: 2 additions & 2 deletions elements/components/expat.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
id: expat
version: 2.6.0
version: 2.6.2
about: A stream oriented C library for parsing XML

depends:
- components/glibc.yml

sources:
- https://master.dl.sourceforge.net/project/expat/expat/%{version}/expat-%{version}.tar.gz
- https://github.com/libexpat/libexpat/releases/download/R_%{version:_}/expat-%{version}.tar.bz2
129 changes: 129 additions & 0 deletions elements/components/firefox-src.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
id: firefox
version: 116.0
about: Firefox is a stand-alone browser based on the Mozilla codebase

script: |-
cat > mozconfig << "EOF"
ac_add_options --prefix=%{prefix}
ac_add_options --with-system-icu
ac_add_options --with-system-libevent
ac_add_options --with-system-libvpx
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-webp
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --without-wasm-sandboxed-libraries
ac_add_options --enable-system-ffi
ac_add_options --enable-system-pixman
ac_add_options --enable-application=browser
ac_add_options --disable-necko-wifi
ac_add_options --disable-debug-symbols
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
unset MOZ_TELEMETRY_REPORTING
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build-dir
EOF
# adapt the line break mapping for ICU 74 or later
for i in {43..47}; do
sed -i '/ZWJ/s/}/,CLASS_CHARACTER&/' intl/lwbrk/LineBreaker.cpp
done
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none
export MOZBUILD_STATE_PATH=${PWD}/mozbuild
./mach build
DESTDIR=%{install-root} ./mach install
install -Dm644 /dev/stdin %{install-root}%{libdir}/firefox/browser/defaults.preferences/vendor.js << "EOF"
pref("intl.locale.requested", "");
pref("spellchecker.dictionary_path", "%{datadir}/hunspell");
pref("browser.shell.checkDefaultBrowser", false);
pref("extensions.autoDisableScope", 11);
EOF
install -Dm644 /dev/stdin %{install-root}%{libdir}/firefox/browser/distribution/distribution.ini << "EOF"
[Global]
id=rlxos
version=2.0
about=Mozilla Firefox for RLXOS
[Preferences]
app.distributor=rlxos
app.distributor.channel=firefox
app.partner.rlxos=rlxos
EOF
for i in 16 22 24 32 48 64 128 256 ; do
install -Dvm644 browser/branding/official/default$i.png \
%{install-root}%{datadir}/icons/hicolor/${i}x${i}/apps/firefox.png
done
install -Dvm644 browser/branding/official/content/about-logo.svg \
%{install-root}%{datadir}/icons/hicolor/scalable/apps/firefox.svg
install -Dvm755 /dev/stdin %{install-root}%{bindir}/firefox << "EOF"
#!/bin/sh
exec %{libdir}/firefox/firefox "$@"
EOF
install -Dvm644 firefox.desktop -t %{install-root}%{datadir}/applications/
depends:
- components/dbus-glib.yml
- components/alsa-lib.yml
- components/at-spi2-core.yml
- components/bash.yml
- components/cairo.yml
- components/dbus.yml
- components/ffmpeg.yml
- components/fontconfig.yml
- components/freetype.yml
- components/gdk-pixbuf.yml
- components/gtk.yml
- components/pulseaudio.yml
- components/x11/libx11.yml
- components/x11/libxcb.yml
- components/x11/libxcomposite.yml
- components/x11/libxdamage.yml
- components/x11/libxext.yml
- components/x11/libxfixes.yml
- components/x11/libxrandr.yml
- components/x11/libxt.yml
- components/nspr.yml
- components/nss.yml
- components/pango.yml
- components/libnotify.yml
- components/networkmanager.yml
- components/xdg-desktop-portal.yml

build-depends:
- components/cbindgen.yml
- components/llvm.yml
- components/diffutils.yml
- components/inetutils.yml
- components/lld.yml
- components/mesa.yml
- components/nodejs.yml
- components/rustc.yml
- components/python.yml
- components/unzip.yml
- components/which.yml
- components/yasm.yml

sources:
- https://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz
- files/firefox/firefox.desktop

# TODO: libpng doesn't have APNG support
# TODO: update rustc compiler
# TODO: update nss
Loading

0 comments on commit 2b2ce53

Please sign in to comment.