Merge branch 'mocaccinoOS:master' into master

msdobrescu · Jul 13, 2024 · b6392b3 · b6392b3
2 parents 4d44053 + 338ca89
commit b6392b3
Show file tree

Hide file tree

Showing 107 changed files with 335 additions and 347 deletions.
diff --git a/packages/apps/calamares/definition.yaml b/packages/apps/calamares/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "calamares"
-version: 3.2.60-r5+13
+version: 3.2.60-r5+15
 uri:
   - https://calamares.io
 license: "GPL-3"

diff --git a/packages/apps/chromium/definition.yaml b/packages/apps/chromium/definition.yaml
@@ -12,10 +12,10 @@ labels:
 provides:
   - name: gn
     category: dev-build
-    version: '>=0'
+    version: ">=0"
   - name: chromium
     category: www-client
-    version: '>=0'
+    version: ">=0"
 requires:
   - category: "layers"
     name: "X"

diff --git a/packages/apps/discover/definition.yaml b/packages/apps/discover/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "discover"
-version: 5.27.11+20
+version: 5.27.11+22
 uri:
   - https://userbase.kde.org/Discover
 license: "GPL-2"

diff --git a/packages/apps/drawing/definition.yaml b/packages/apps/drawing/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "drawing"
-version: 1.0.2+51
+version: 1.0.2+53
 uri:
   - https://github.com/maoschanz/drawing
 license: "GPL-3"

diff --git a/packages/apps/edgevpn-gui/definition.yaml b/packages/apps/edgevpn-gui/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "edgevpn-gui"
-version: 0.2.1+154
+version: 0.2.1+156
 description: "A graphical frontend for edgeVPN"
 requires:
   - category: "layers"

diff --git a/packages/apps/egl-wayland/definition.yaml b/packages/apps/egl-wayland/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "egl-wayland"
-version: 1.1.13+25
+version: 1.1.13+27
 uri:
   - https://github.com/NVIDIA/egl-wayland
 license: "MIT"

diff --git a/packages/apps/evolution/definition.yaml b/packages/apps/evolution/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "evolution"
-version: 3.50.2+22
+version: 3.50.2+24
 uri:
   - https://wiki.gnome.org/Apps/Evolution
 license: "LGPL-3"

diff --git a/packages/apps/firefox/definition.yaml b/packages/apps/firefox/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "firefox"
-version: 115.12.0+3
+version: 115.12.0+4
 uri:
   - https://www.mozilla.com/firefox
 license: "MPL-2.0 GPL-2 LGPL-2.1"

diff --git a/packages/apps/flatpak/definition.yaml b/packages/apps/flatpak/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "flatpak"
-version: 1.14.6+1
+version: 1.14.8+1
 uri:
   - https://flatpak.org
 license: "LGPL-2.1+"

diff --git a/packages/apps/fyneterm/definition.yaml b/packages/apps/fyneterm/definition.yaml
@@ -1,7 +1,7 @@
 category: "apps"
 name: "fyneterm"
 sha: "ef292b54d29ab457a4eff35f085b8204a18003a4"
-version: 0.99999+180
+version: 0.99999+182
 description: "A graphical terminal emulator for Linux using Fyne"
 urls:
   - https://github.com/fyne-io/terminal

diff --git a/packages/apps/geary/definition.yaml b/packages/apps/geary/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "geary"
-version: 44.1-r1+44
+version: 44.1-r1+46
 uri:
   - https://wiki.gnome.org/Apps/Geary
 license: "LGPL-2.1+ CC-BY-3.0 CC-BY-SA-3.0"

diff --git a/packages/apps/gnome-boxes/definition.yaml b/packages/apps/gnome-boxes/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "gnome-boxes"
-version: 45.0+24
+version: 45.0+26
 uri:
   - https://wiki.gnome.org/Apps/Boxes
 license: "LGPL-2+ CC-BY-2.0"

diff --git a/packages/apps/gnome-disk-utility/definition.yaml b/packages/apps/gnome-disk-utility/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "gnome-disk-utility"
-version: 45.1+2
+version: 45.1+4
 uri:
   - https://wiki.gnome.org/Apps/Disks
 license: "GPL-2+"

diff --git a/packages/apps/gnome-software/definition.yaml b/packages/apps/gnome-software/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "gnome-software"
-version: 46.2+2
+version: 46.2+4
 uri:
   - https://wiki.gnome.org/Apps/Software
 license: "GPL-2+"

diff --git a/packages/apps/golauncher/definition.yaml b/packages/apps/golauncher/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "golauncher"
-version: 0.2.2+170
+version: 0.2.2+172
 description: "Highly extensible, customizable application launcher and window switcher written in less than 300 lines of Golang and fyne "
 requires:
   - category: "layers"

diff --git a/packages/apps/gparted/definition.yaml b/packages/apps/gparted/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "gparted"
-version: 1.6.0+2
+version: 1.6.0+4
 uri:
   - https://gparted.org
 license: "GPL-2+ FDL-1.2+"

diff --git a/packages/apps/guake/definition.yaml b/packages/apps/guake/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "guake"
-version: 3.9.0+88
+version: 3.9.0+90
 uri:
   - http://guake-project.org
 license: "GPL-2+"

diff --git a/packages/apps/kitty/definition.yaml b/packages/apps/kitty/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "kitty"
-version: 0.34.1+1
+version: 0.34.1+3
 uri:
   - https://sourceforge.net/projects/slim.berlios
 license: "GPL-2"

diff --git a/packages/apps/libva-intel-driver/definition.yaml b/packages/apps/libva-intel-driver/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "libva-intel-driver"
-version: 2.4.1-r4+86
+version: 2.4.1-r4+88
 uri:
   - https://github.com/intel/intel-vaapi-driver
 license: "MIT"

diff --git a/packages/apps/lightdm/definition.yaml b/packages/apps/lightdm/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "lightdm"
-version: 1.32.0-r2+54
+version: 1.32.0-r2+56
 uri:
   - https://launchpad.net/lightdm
 license: "GPL-3 LGPL-3"

diff --git a/packages/apps/lutris/build.yaml b/packages/apps/lutris/build.yaml
diff --git a/packages/apps/lutris/definition.yaml b/packages/apps/lutris/definition.yaml
diff --git a/packages/apps/lutris/finalize.yaml b/packages/apps/lutris/finalize.yaml
diff --git a/packages/apps/lutris/package.accept_keywords/01-lutris.accept_keywords b/packages/apps/lutris/package.accept_keywords/01-lutris.accept_keywords
diff --git a/packages/apps/mocaccino-statusbar/definition.yaml b/packages/apps/mocaccino-statusbar/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "mocaccino-statusbar"
-version: 0.4.4+218
+version: 0.4.4+220
 requires:
   - category: "layers"
     name: "X"

diff --git a/packages/apps/mos-updater/definition.yaml b/packages/apps/mos-updater/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "mos-updater"
-version: 0.1+181
+version: 0.1+183
 requires:
   - category: "layers"
     name: "X"

diff --git a/packages/apps/neofetch/definition.yaml b/packages/apps/neofetch/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "neofetch"
-version: 7.1.0-r1+57
+version: 7.1.0-r1+59
 uri:
   - https://github.com/dylanaraps/neofetch
 license: "MIT-with-advertising"

diff --git a/packages/apps/pavucontrol-qt/definition.yaml b/packages/apps/pavucontrol-qt/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "pavucontrol-qt"
-version: 1.3.0-r1+42
+version: 1.3.0-r1+44
 uri:
   - https://lxqt-project.org
 license: "GPL-2 GPL-2+"

diff --git a/packages/apps/slick-greeter/definition.yaml b/packages/apps/slick-greeter/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "slick-greeter"
-version: 2.0.2+36
+version: 2.0.2+38
 uri:
   - https://github.com/linuxmint/slick-greeter
 license: "GPL-3"

diff --git a/packages/apps/slim/definition.yaml b/packages/apps/slim/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "slim"
-version: 1.4.0+27
+version: 1.4.0+29
 uri:
   - https://sourceforge.net/projects/slim.berlios
 license: "GPL-2"

diff --git a/packages/apps/spice-vdagent/definition.yaml b/packages/apps/spice-vdagent/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "spice-vdagent"
-version: 0.21.0+95
+version: 0.21.0+97
 uri:
   - https://www.spice-space.org/
 license: "LGPL-2.1"

diff --git a/packages/apps/steam/definition.yaml b/packages/apps/steam/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "steam"
-version: 1.0.0.79+4
+version: 1.0.0.79+6
 uri:
   - https://steampowered.com
 license: "ValveSteamLicense MIT BSD"

diff --git a/packages/apps/thunderbird/definition.yaml b/packages/apps/thunderbird/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "thunderbird"
-version: 115.11.0+7
+version: 115.12.2+1
 uri:
   - https://www.thunderbird.net
 license: "MPL-2.0 GPL-2 LGPL-2.1"

diff --git a/packages/apps/vim/definition.yaml b/packages/apps/vim/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "vim"
-version: 9.0.2167+23
+version: 9.0.2167+25
 uri:
   - https://github.com/vim/vim
 license: "vim"

diff --git a/packages/apps/virt-manager/definition.yaml b/packages/apps/virt-manager/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "virt-manager"
-version: 4.1.0-r1+22
+version: 4.1.0-r1+24
 uri:
   - https://virt-manager.org
 license: "GPL-2"

diff --git a/packages/apps/virtualbox/definition.yaml b/packages/apps/virtualbox/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "virtualbox"
-version: 7.0.18-r1+6
+version: 7.0.18-r1+9
 uri:
   - https://www.virtualbox.org
 license: "GPL-2"

diff --git a/packages/apps/vlc/definition.yaml b/packages/apps/vlc/definition.yaml
@@ -1,6 +1,6 @@
 category: "apps"
 name: "vlc"
-version: 3.0.20-r5+15
+version: 3.0.20-r11+1
 uri:
   - https://www.videolan.org/vlc
 license: "LGPL-2.1 GPL-2"

diff --git a/packages/buildbases/collection.yaml b/packages/buildbases/collection.yaml
@@ -2,7 +2,7 @@ packages:
   - &X
     name: "X"
     category: "buildbase"
-    version: 0+207
+    version: 0+211
     real_category: "layers"
     hidden: true
   - !!merge <<: *X
@@ -12,32 +12,39 @@ packages:
   - !!merge <<: *X
     real_category: "layers"
     name: "sys-fs"
-    version: 0+116
+    version: 0+118
   - !!merge <<: *X
     real_category: "layers"
     name: "kde-common"
-    version: 0+216
+    version: 0+219
   - !!merge <<: *X
     real_category: "layers"
     name: "qt"
-    version: 0+210
+    version: 0+213
+  - !!merge <<: *X
+    real_category: "layers"
+    name: "qt6"
+    version: 0+2
   - !!merge <<: *X
     real_category: "kernel-sources"
     name: "mocaccino-lts-sources"
-    version: 0+24
+    version: 0+27
   - !!merge <<: *X
     real_category: "kernel-modules"
     name: "virtualbox-modules-lts"
-    version: 0+254
-  - !!merge <<: *X
-    real_category: "kernel-modules"
-    name: "vhba-lts"
-    version: 0+38
+    version: 0+257
+    #  2024-07-06: Joost Ruis
+    #  We used to produce this for C-R needed for cdemu
+    #  Looks like it is not required anymore.
+    #  - !!merge <<: *X
+    #    real_category: "kernel-modules"
+    #    name: "vhba-lts"
+    #    version: 0+40
   - !!merge <<: *X
     real_category: "layers"
     name: "gnome-common"
-    version: 0+229
+    version: 0+232
   - !!merge <<: *X
     real_category: "layers"
     name: "qemu"
-    version: 0+174
+    version: 0+176