Merge branch 'master' into flatpak-update
This commit is contained in:
Ertuğrul Erata
@@ -0,0 +1,44 @@
|
||||
diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile
|
||||
index 18466b48..7c7de4e5 100644
|
||||
--- a/src/VBox/HostDrivers/linux/Makefile
|
||||
+++ b/src/VBox/HostDrivers/linux/Makefile
|
||||
@@ -23,25 +23,25 @@
|
||||
# terms and conditions of either the GPL or the CDDL or both.
|
||||
#
|
||||
|
||||
-ifneq ($(KERNELRELEASE),)
|
||||
+ifneq ($(KBUILD_EXTMOD),)
|
||||
|
||||
-# Building from kBuild (make -C <kernel_directory> M=`pwd`),
|
||||
-# or inside a kernel source tree.
|
||||
+# Building from kBuild (make -C <kernel_directory> M=`pwd`).
|
||||
+# KBUILD_EXTMOD is set to $(M) in this case.
|
||||
|
||||
obj-m = vboxdrv/
|
||||
-ifneq ($(wildcard $(CURDIR)/vboxnetflt/Makefile),)
|
||||
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetflt/Makefile),)
|
||||
obj-m += vboxnetflt/
|
||||
endif
|
||||
-ifneq ($(wildcard $(CURDIR)/vboxnetadp/Makefile),)
|
||||
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxnetadp/Makefile),)
|
||||
obj-m += vboxnetadp/
|
||||
endif
|
||||
-ifneq ($(wildcard $(CURDIR)/vboxpci/Makefile),)
|
||||
+ifneq ($(wildcard $(KBUILD_EXTMOD)/vboxpci/Makefile),)
|
||||
obj-m += vboxpci/
|
||||
endif
|
||||
|
||||
-else # ! KERNELRELEASE
|
||||
+else # ! KBUILD_EXTMOD
|
||||
|
||||
-# convenience Makefile without KERNELRELEASE
|
||||
+# convenience Makefile without KBUILD_EXTMOD
|
||||
|
||||
KBUILD_VERBOSE ?=
|
||||
KERN_VER ?= $(shell uname -r)
|
||||
@@ -146,4 +146,4 @@ load: unload
|
||||
fi; \
|
||||
done
|
||||
|
||||
-endif # ! KERNELRELEASE
|
||||
+endif # ! KBUILD_EXTMOD
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>app:gui</IsA>
|
||||
<Summary>A powerful virtualization program</Summary>
|
||||
<Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
|
||||
<Archive sha1sum="39c472d49e8e25dce39a3d296ca4033ae4643dd1" type="tarbz2">http://download.virtualbox.org/virtualbox/6.0.4/VirtualBox-6.0.4.tar.bz2</Archive>
|
||||
<Archive sha1sum="f119eee3c7c57af6c283426dcfaf47db456532ba" type="tarbz2">http://download.virtualbox.org/virtualbox/6.0.8/VirtualBox-6.0.8.tar.bz2</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>dev86</Dependency>
|
||||
<Dependency>cdrkit</Dependency>
|
||||
@@ -66,6 +66,7 @@
|
||||
<Patch level="1">012-vboxsf-automount.patch</Patch>
|
||||
<Patch level="1">001_virtualbox-5.0.16-mesa-check.patch</Patch> -->
|
||||
<Patch level="1">009-virtualbox-5.1.0-add_missing_gl_header.patch</Patch>
|
||||
<Patch level="1">013-Makefile.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -155,6 +156,20 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="24">
|
||||
<Date>2019-05-17</Date>
|
||||
<Version>6.0.8</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="23">
|
||||
<Date>2019-04-19</Date>
|
||||
<Version>6.0.6</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="22">
|
||||
<Date>2019-01-29</Date>
|
||||
<Version>6.0.4</Version>
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# Copyright 2018 TUBITAK/UEKAE
|
||||
# Licensed under the GNU General Public License, version 2.
|
||||
# See the file http://www.gnu.org/copyleft/gpl.txt.
|
||||
|
||||
from pisi.actionsapi import autotools
|
||||
from pisi.actionsapi import pisitools
|
||||
from pisi.actionsapi import shelltools
|
||||
from pisi.actionsapi import get
|
||||
|
||||
def setup():
|
||||
#shelltools.system("NOCONFIGURE=1 ./autogen.sh")
|
||||
|
||||
autotools.configure("--with-systemduserunitdir=none \
|
||||
--disable-geoclue \
|
||||
--disable-pipewire")
|
||||
|
||||
def build():
|
||||
autotools.make()
|
||||
|
||||
def install():
|
||||
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
|
||||
|
||||
pisitools.dodoc("COPYING", "NEWS")
|
||||
@@ -0,0 +1,56 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!DOCTYPE PISI SYSTEM "http://www.pardus.org.tr/projeler/pisi/pisi-spec.dtd">
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>xdg-desktop-portal-gtk</Name>
|
||||
<Homepage>https://github.com/flatpak/xdg-desktop-portal-gtk</Homepage>
|
||||
<Packager>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Packager>
|
||||
<License>LGPLv2</License>
|
||||
<Summary>A portal frontend service for Flatpak and possibly other desktop containment frameworks</Summary>
|
||||
<Description>A portal frontend service for Flatpak and possibly other desktop containment frameworks</Description>
|
||||
<Archive sha1sum="23a766edbc0dd80dbc7aab55fb016bcbff808baf" type="tarxz">https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/1.2.0/xdg-desktop-portal-gtk-1.2.0.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>xmlto</Dependency>
|
||||
<Dependency>glib2-devel</Dependency>
|
||||
<Dependency>dbus-devel</Dependency>
|
||||
<Dependency>util-linux</Dependency>
|
||||
<Dependency versionFrom="1.2.4">flatpak-devel</Dependency>
|
||||
<Dependency>fuse-devel</Dependency>
|
||||
<Dependency>xdg-desktop-portal</Dependency>
|
||||
<Dependency>gettext-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
<Name>xdg-desktop-portal-gtk</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>glib2</Dependency>
|
||||
<Dependency>gtk3</Dependency>
|
||||
<Dependency>gdk-pixbuf</Dependency>
|
||||
<Dependency>xdg-desktop-portal</Dependency>
|
||||
<Dependency versionFrom="1.2.4">flatpak</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="library">/usr/libexec</Path>
|
||||
<Path fileType="data">/usr/share/dbus-1</Path>
|
||||
<Path fileType="data">/usr/share/applications</Path>
|
||||
<Path fileType="data">/usr/share/xdg-desktop-portal</Path>
|
||||
<Path fileType="locale">/usr/share/locale</Path>
|
||||
<Path fileType="doc">/usr/share/doc</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="1">
|
||||
<Date>2019-05-12</Date>
|
||||
<Version>1.2.0</Version>
|
||||
<Comment>First Release.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
</History>
|
||||
</PISI>
|
||||
@@ -3,7 +3,7 @@
|
||||
<PISI>
|
||||
<Source>
|
||||
<Name>xdg-desktop-portal</Name>
|
||||
<Homepage></Homepage>
|
||||
<Homepage>https://github.com/flatpak/xdg-desktop-portal</Homepage>
|
||||
<Packager>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
|
||||
Reference in New Issue
Block a user