Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pisilinux/main

Browse Source
This commit is contained in:
Erkan IŞIK
2020-04-22 13:49:28 +03:00
parent 8496b5927a d4c4a15e33
commit e30389e68b
19 changed files with 265 additions and 6932 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/applications/dolphin/files/kdebug-419585.patch
+47
View File
@@ -0,0 +1,47 @@
From 35b4c6d4df1281afd621374e686f19e654ad7bae Mon Sep 17 00:00:00 2001
From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org>
Date: Tue, 7 Apr 2020 17:14:59 +0200
Subject: Fix crashing on starting and quitting
QCollator (especially with Qt 5.14 and ICU 65.1) is very unhappy with
threads.
To avoid having to lock and unlock the mutex everywhere (and ensure it
is unlocked before calling other things that might lock it, etc.), we do
it as locally as possible. Even if for some reason Qt and ICU make
QCollator threadsafe in the future locking here should have minimal
impact.
BUG: 419585
Differential Revision: https://phabricator.kde.org/D28659
---
src/kitemviews/kfileitemmodel.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 4b35a02..e4dca27 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -33,6 +33,9 @@
#include <QMimeData>
#include <QTimer>
#include <QWidget>
+#include <QMutex>
+
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, s_collatorMutex, (QMutex::Recursive))
// #define KFILEITEMMODEL_DEBUG
@@ -1878,6 +1881,8 @@ int KFileItemModel::sortRoleCompare(const ItemData* a, const ItemData* b, const
int KFileItemModel::stringCompare(const QString& a, const QString& b, const QCollator& collator) const
{
+ QMutexLocker collatorLock(s_collatorMutex());
+
if (m_naturalSorting) {
return collator.compare(a, b);
}
--
cgit v1.1
desktop/kde/applications/dolphin/pspec.xml
+1
View File
@@ -44,6 +44,7 @@
</BuildDependencies>
<Patches>
<Patch level="1">dolphin-17.04.0-allow-root.patch</Patch>
<Patch level="1">kdebug-419585.patch</Patch>
</Patches>
</Source>
desktop/misc/lxdm/actions.py
+5 -4
View File
@@ -7,13 +7,13 @@
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
from pisi.actionsapi import shelltools
def setup():
#shelltools.system("./autogen.sh")
autotools.configure("--prefix=/usr \
--sysconfdir=/etc \
--with-pam \
--enable-gtk3 \
--with-systemdsystemunitdir=no")
--enable-gtk3")
def build():
autotools.make()
@@ -22,6 +22,7 @@ def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
#install Pisi Linux default theme
#pisitools.insinto("/usr/share/lxdm/themes", "lxdm-pisilinux-theme")
pisitools.dodir("/usr/share/lxdm/themes/lxdm-pisilinux-theme")
pisitools.insinto("/usr/share/lxdm/themes/lxdm-pisilinux-theme", "lxdm-pisilinux-theme-0.1/*")
#pisitools.remove("/usr/share/lxdm/themes/lxdm-pisilinux-theme/login.png")
pisitools.dodoc("COPYING", "AUTHORS", "TODO", "README", "ChangeLog", "NEWS")
desktop/misc/lxdm/files/customizetion_for_pisilinux.patch
+50
View File
@@ -0,0 +1,50 @@
diff -Nuar a/data/lxdm.conf.in b/data/lxdm.conf.in
--- a/data/lxdm.conf.in 2014-11-23 11:56:36.000000000 +0200
+++ b/data/lxdm.conf.in 2020-04-16 22:20:06.073013398 +0300
@@ -7,10 +7,10 @@
# timeout=10
## default session or desktop used when no systemwide config
-# session=/usr/bin/startlxde
+session=/usr/bin/startlxqt
## uncomment and set to set numlock on your keyboard
-# numlock=0
+numlock=1
## set this if you don't want to put xauth file at ~/.Xauthority
# xauth_path=/tmp
@@ -34,7 +34,7 @@
gtk_theme=Clearlooks
## background of the greeter
-bg=/usr/share/backgrounds/default.png
+#bg=/usr/share/backgrounds/default.png
## if show bottom pane
bottom_pane=1
@@ -43,10 +43,15 @@
lang=1
## if show keyboard layout select control
-keyboard=0
+keyboard=1
+
+## if set show onscreen-keyboard button and run content on click
+onscreenkeyboard=onboard
## the theme of greeter
-theme=Industrial
+theme=lxdm-pisilinux-theme
+
+hide_time=1
[input]
@@ -58,5 +63,5 @@
white=
## blacklist user
-black=
+black=ftp
desktop/misc/lxdm/files/default_config.patch
-28
View File
@@ -1,28 +0,0 @@
diff -Nuar lxdm-0.5.0.orig/data/lxdm.conf.in lxdm-0.5.0/data/lxdm.conf.in
--- lxdm-0.5.0.orig/data/lxdm.conf.in 2012-02-27 13:28:25.000000000 +0200
+++ lxdm-0.5.0/data/lxdm.conf.in 2014-08-18 14:01:59.955134485 +0300
@@ -34,7 +34,7 @@
gtk_theme=Clearlooks
## background of the greeter
-bg=/usr/share/backgrounds/default.png
+#bg=/usr/share/backgrounds/default.png
## if show bottom pane
bottom_pane=1
@@ -46,7 +46,7 @@
keyboard=0
## the theme of greeter
-theme=Industrial
+theme=Industrial
[input]
@@ -58,5 +58,5 @@
white=
## blacklist user
-black=
+black=ftp
desktop/misc/lxdm/files/default_session.patch
-12
View File
@@ -1,12 +0,0 @@
diff -Nuar lxdm-0.5.3.orig/data/lxdm.conf.in lxdm-0.5.3/data/lxdm.conf.in
--- lxdm-0.5.3.orig/data/lxdm.conf.in 2017-11-19 17:40:33.970019559 +0300
+++ lxdm-0.5.3/data/lxdm.conf.in 2017-11-19 17:41:50.406021375 +0300
@@ -7,7 +7,7 @@
# timeout=10
## default session or desktop used when no systemwide config
-# session=/usr/bin/startlxde
+session=/usr/bin/startkde
## uncomment and set to set numlock on your keyboard
# numlock=0
desktop/misc/lxdm/files/login.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

desktop/misc/lxdm/files/lxdm-0.5.3-upstream-fixes.patch
-236
View File
@@ -1,236 +0,0 @@
From c6836939c6fd603f86f469bb7c6502b28b1ca583 Mon Sep 17 00:00:00 2001
From: dgod <dgod.osa@gmail.com>
Date: Sun, 3 Jan 2016 11:53:13 +0800
Subject: [PATCH 01/07] create user specific directory under /var/run
---
src/lxdm.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lxdm.c b/src/lxdm.c
index a37f051..d81b587 100644
--- a/src/lxdm.c
+++ b/src/lxdm.c
@@ -750,7 +750,13 @@ static char ** create_client_auth(struct passwd *pw,char **env)
if(xauth_write_file(authfile,s->display,s->mcookie)==-1)
{
g_free(authfile);
- authfile = g_strdup_printf("/var/run/lxdm/.Xauth%d",pw->pw_uid);
+
+ gchar *authdir = g_strdup_printf("/var/run/lxdm/%d", pw->pw_uid);
+ g_mkdir_with_parents(authdir, S_IRWXU);
+ chown(authdir, pw->pw_uid, pw->pw_gid);
+
+ authfile = g_strdup_printf("%s/.Xauthority", authdir);
+ g_free(authdir);
remove(authfile);
xauth_write_file(authfile,s->display,s->mcookie);
}
--
2.1.4
From 7258b57fd305182c6c031eb8c1ded96c5a06f6da Mon Sep 17 00:00:00 2001
From: dgod <dgod.osa@gmail.com>
Date: Sat, 20 Feb 2016 22:36:59 +0800
Subject: [PATCH 02/07] fix build before gtk 2.22
---
src/greeter-gdk.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/greeter-gdk.c b/src/greeter-gdk.c
index 1abbefa..ad3267a 100644
--- a/src/greeter-gdk.c
+++ b/src/greeter-gdk.c
@@ -22,6 +22,7 @@
#define XLIB_ILLEGAL_ACCESS
+#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
@@ -88,12 +89,14 @@ static void on_ui_expose(void)
}
cr=gdk_cairo_create(win);
+#if GTK_CHECK_VERSION(3,0,0)
cairo_pattern_t *pattern=gdk_window_get_background_pattern(win);
if(pattern)
{
cairo_set_source(cr,pattern);
cairo_paint(cr);
}
+#endif
gdk_cairo_set_source_color(cr, &bg);
cairo_rectangle(cr, rc.x, rc.y, rc.width, rc.height);
--
2.1.4
From 5d36a53702f1e60bb316946f1edccb2dbc3c01bd Mon Sep 17 00:00:00 2001
From: dgod <dgod.osa@gmail.com>
Date: Sun, 21 Feb 2016 10:45:58 +0800
Subject: [PATCH 03/07] fix with user_list only: problem when password check
fail
---
src/greeter.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/greeter.c b/src/greeter.c
index 10b7f3f..03503b6 100644
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -146,7 +146,7 @@ static void switch_to_input_user(void)
if(user_list_scrolled)
gtk_widget_show(user_list_scrolled);
else
- gtk_widget_hide(user_list);
+ gtk_widget_show(user_list);
gtk_widget_grab_focus(user_list);
}
else
--
2.1.4
From fe121ce70ad5e99bd3b3b896dfcbe439dd22716c Mon Sep 17 00:00:00 2001
From: dgod <dgod.osa@gmail.com>
Date: Sun, 21 Feb 2016 11:45:35 +0800
Subject: [PATCH 04/07] fix not honor ctl+alt+backspacer for restarting
---
src/lxdm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/lxdm.c b/src/lxdm.c
index d81b587..e00d219 100644
--- a/src/lxdm.c
+++ b/src/lxdm.c
@@ -962,6 +962,11 @@ static void on_xserver_stop(void *data,int pid, int status)
s->dpy=NULL;
ui_drop();
lxdm_startx(s);
+ #ifndef DISABLE_XAUTH
+ char temp[256];
+ sprintf(temp,"/var/run/lxdm/lxdm-:%d.auth",s->display);
+ setenv("XAUTHORITY",temp,1);
+ #endif
ui_prepare();
lxsession_set_active(s);
}
--
2.1.4
From 72812894cfd9454d70e4b0753531e46580416771 Mon Sep 17 00:00:00 2001
From: dgod <dgod.osa@gmail.com>
Date: Mon, 21 Mar 2016 19:25:25 +0800
Subject: [PATCH 05/07] fix css under gtk 3.20
---
data/themes/Industrial/gtk.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/Industrial/gtk.css b/data/themes/Industrial/gtk.css
index 179f0d6..f8e6432 100644
--- a/data/themes/Industrial/gtk.css
+++ b/data/themes/Industrial/gtk.css
@@ -17,6 +17,7 @@
color: #000000;
}
+#bottom_pane label,
#bottom_pane GtkLabel {
font: Sans 12;
color: #9E9D9B;
--
2.1.4
From 855c090f1330aedc97b9a486dcd0d0b4c7ff4f4e Mon Sep 17 00:00:00 2001
From: dgod <dgod.osa@gmail.com>
Date: Sun, 16 Oct 2016 12:49:40 +0800
Subject: [PATCH 06/07] Compile with the musl c library (no execinfo.h)
---
configure.ac | 2 +-
src/lxdm.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 52f2ac9..a9fca61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AM_CONDITIONAL(HAVE_PAM, [test -n "$USE_PAM" -a "x$USE_PAM" != xno ])
# Checks for header files.
AC_PATH_X
-AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h])
+AC_CHECK_HEADERS([execinfo.h shadow.h stdlib.h string.h unistd.h utmpx.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_PID_T
diff --git a/src/lxdm.c b/src/lxdm.c
index e00d219..53d2176 100644
--- a/src/lxdm.c
+++ b/src/lxdm.c
@@ -49,7 +49,9 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
+#ifdef HAVE_EXECINFO_H
#include <execinfo.h>
+#endif
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
@@ -1552,6 +1554,7 @@ int lxdm_do_auto_login(void)
static void log_sigsegv(void)
{
+#ifdef HAVE_EXECINFO_H
void *array[40];
size_t size;
char **bt_strs;
@@ -1564,6 +1567,7 @@ static void log_sigsegv(void)
fprintf(stderr, "%s\n", bt_strs[i]);
free(bt_strs);
+#endif
}
static void sigsegv_handler(int sig)
--
2.1.4
From a548c73e35d62ec334df5cd3a491ee409d0067bd Mon Sep 17 00:00:00 2001
From: dgod <dgod.osa@gmail.com>
Date: Fri, 11 Nov 2016 20:24:30 +0800
Subject: [PATCH 07/07] fix tcp_listen=1 does not work for mordern X.org
---
src/lxdm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lxdm.c b/src/lxdm.c
index 53d2176..722936f 100644
--- a/src/lxdm.c
+++ b/src/lxdm.c
@@ -490,6 +490,9 @@ static char *lxsession_xserver_command(LXSession *s)
{
arg[arc++] = g_strdup("-nolisten");
arg[arc++] = g_strdup("tcp");
+ } else {
+ arg[arc++] = g_strdup("-listen");
+ arg[arc++] = g_strdup("tcp");
}
if(!novtswitch)
{
--
2.1.4
desktop/misc/lxdm/files/onscreenkeyboard.patch
+62
View File
@@ -0,0 +1,62 @@
X-Git-Url: https://git.lxde.org/gitweb/?p=lxde%2Flxdm.git;a=blobdiff_plain;f=src%2Fgreeter.c;h=0e26b6d42e9ddb1d0d9069d3ae034f8485086668;hp=65c74550b88488f1ad2cabca273cabca0fd0376d;hb=cee37e0d27c07023cb08925330ae2db691e2429c;hpb=7ed5f86780a2de415b590b6ec5136e15b1fd888d
diff --git a/src/greeter.c b/src/greeter.c
index 65c7455..0e26b6d 100644
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -70,6 +70,7 @@ static GtkWidget* user_list;
static GtkWidget* sessions;
static GtkWidget* lang;
+static GtkWidget* onscreenkeyboard_btn;
static GtkWidget* exit_btn;
static GtkWidget* exit_menu;
@@ -81,6 +82,8 @@ static char* pass = NULL;
static char* ui_file = NULL;
static char *ui_nobody = NULL;
+static char* onscreenkeyboard_cmd = NULL;
+
static GIOChannel *greeter_io;
static int auto_login;
@@ -720,6 +723,15 @@ static void on_exit_clicked(GtkButton* exit_btn, gpointer user_data)
0, gtk_get_current_event_time() );
}
+static void on_screenkeyboard_clicked(GtkButton* screenkeyboard_btn,
+ gpointer user_data)
+{
+ gboolean res;
+ /* set the current xkb */
+ res=g_spawn_command_line_async(onscreenkeyboard_cmd, NULL);
+ printf("spawn onscreenkeyboard: %s %d\n", onscreenkeyboard_cmd, res);
+}
+
static void load_exit()
{
GtkWidget* item;
@@ -1248,6 +1260,21 @@ static void create_win()
load_exit();
}
+ onscreenkeyboard_btn = (GtkWidget*)gtk_builder_get_object(builder, "onscreenkeyboard");
+ onscreenkeyboard_cmd = g_key_file_get_string(config, "display", "onscreenkeyboard",NULL);
+
+ if(onscreenkeyboard_cmd && onscreenkeyboard_cmd[0])
+ {
+ gtk_widget_show(onscreenkeyboard_btn);
+ g_signal_connect(onscreenkeyboard_btn, "clicked", G_CALLBACK(on_screenkeyboard_clicked), NULL);
+ }
+ else
+ {
+ if (onscreenkeyboard_btn != NULL) {
+ gtk_widget_hide(onscreenkeyboard_btn);
+ }
+ }
+
ui_get_geometry(window,&rc);
gtk_window_move(GTK_WINDOW(win),rc.x,rc.y);
gtk_window_set_default_size(GTK_WINDOW(win),rc.width,rc.height);
desktop/misc/lxdm/files/wave.svg
-6622
View File
File diff suppressed because it is too large Load Diff
Side by Side

Before

Width:  |  Height:  |  Size: 205 KiB

desktop/misc/lxdm/pspec.xml
+13 -20
View File
@@ -13,14 +13,12 @@
<IsA>app:gui</IsA>
<Summary>LXDE Display Manager</Summary>
<Description>LXDM is the future display manager of LXDE.</Description>
<Archive sha1sum="8c4f7439fa7b56a97e8b19dc62af02a88ae12b45" type="tarxz">mirrors://sourceforge/lxdm/lxdm-0.5.3.tar.xz</Archive>
<!--Archive sha1sum="1934b7f22adc50445a935db817febe4b6ec1a5f2" target="lxdm-0.5.0" type="tarxz">http://source.pisilinux.org/1.0/lxdm-pisilinux-theme.tar.xz</Archive-->
<Archive sha1sum="8c4f7439fa7b56a97e8b19dc62af02a88ae12b45" type="tarxz">mirrors://sourceforge/lxdm/lxdm-0.5.3.tar.xz</Archive>
<Archive sha1sum="73ed5bb99dde48f933c9ccfaf0296041e4fcba43" target="lxdm-0.5.3" type="targz">https://github.com/ayhanyalcinsoy/lxdm-pisilinux-theme/archive/v0.1.tar.gz</Archive>
<BuildDependencies>
<Dependency>intltool</Dependency>
<Dependency>iso-codes-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<!-- <Dependency>gtk2-devel</Dependency> -->
<Dependency>cairo-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>dbus-devel</Dependency>
@@ -34,8 +32,9 @@
<Dependency>at-spi2-core-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">default_config.patch</Patch>
<Patch level="1">default_session.patch</Patch>
<Patch>onscreenkeyboard.patch</Patch>
<Patch>customizetion_for_pisilinux.patch</Patch>
</Patches>
</Source>
@@ -50,14 +49,10 @@
</Conflicts>
<RuntimeDependencies>
<Dependency>pam</Dependency>
<Dependency>iso-codes</Dependency>
<Dependency>gtk3</Dependency>
<!-- <Dependency>gtk2</Dependency> -->
<Dependency>cairo</Dependency>
<Dependency>pango</Dependency>
<Dependency>gdk-pixbuf</Dependency>
<Dependency>at-spi2-atk</Dependency>
<Dependency>at-spi2-core</Dependency>
<Dependency>dbus</Dependency>
<Dependency>glib2</Dependency>
<Dependency>libX11</Dependency>
@@ -74,9 +69,7 @@
<Path fileType="data">/etc/conf.d/xdm</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/display-managers/lxdm.desktop">lxdm.desktop</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/lxdm/themes/Industrial/wave.svg">wave.svg</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/lxdm/themes/Industrial/login.png">login.png</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/display-managers/lxdm.desktop">lxdm.desktop</AdditionalFile>
</AdditionalFiles>
<Provides>
<COMAR script="service.py">System.Service</COMAR>
@@ -84,14 +77,14 @@
</Package>
<History>
<Update release="10">
<Date>2020-02-08</Date>
<Update release="10">
<Date>2020-04-16</Date>
<Version>0.5.3</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="9">
<Comment>Added new pisilinux theme</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="9">
<Date>2019-04-21</Date>
<Version>0.5.3</Version>
<Comment>Rebuild at-spi2.</Comment>
kernel/drivers/module-nvidia-current/pspec.xml
+2 -2
View File
@@ -19,7 +19,7 @@
<AdditionalFile owner="root" permission="0644" target="NVIDIA-Linux-x86_64-430.64-work-around-mga-bug-25890.patch">mageia/NVIDIA-Linux-x86_64-430.64-work-around-mga-bug-25890.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency version="5.6.4">kernel-module-headers</Dependency>
<Dependency version="5.6.6">kernel-module-headers</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
@@ -31,7 +31,7 @@
<IsA>driver</IsA>
<Summary>Kernel module for current NVIDIA graphics driver releases</Summary>
<RuntimeDependencies>
<Dependency version="5.6.4">kernel</Dependency>
<Dependency version="5.6.6">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
kernel/drivers/module-nvidia340/pspec.xml
+2 -2
View File
@@ -21,7 +21,7 @@
<AdditionalFile owner="root" permission="0644" target="kernel-5.6.patch">NVIDIA-Linux-x86_64-340.108-kernel-5.6.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency version="5.6.4">kernel-module-headers</Dependency>
<Dependency version="5.6.6">kernel-module-headers</Dependency>
</BuildDependencies>
</Source>
@@ -30,7 +30,7 @@
<IsA>driver</IsA>
<Summary>Kernel module for NVIDIA driver 340.xx releases</Summary>
<RuntimeDependencies>
<Dependency version="5.6.4">kernel</Dependency>
<Dependency version="5.6.6">kernel</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library" permanent="true">/lib/modules</Path>
kernel/drivers/module-nvidia390/pspec.xml
+2 -2
View File
@@ -20,7 +20,7 @@
<AdditionalFile owner="root" permission="0644" target="kernel-5.6-uvm.patch">NVIDIA-Linux-x86_64-390.132-kernel-5.6-uvm.patch</AdditionalFile>
</AdditionalFiles>
<BuildDependencies>
<Dependency version="5.6.4">kernel-module-headers</Dependency>
<Dependency version="5.6.6">kernel-module-headers</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
@@ -32,7 +32,7 @@
<IsA>driver</IsA>
<Summary>Kernel module for current NVIDIA graphics driver releases</Summary>
<RuntimeDependencies>
<Dependency version="5.6.4">kernel</Dependency>
<Dependency version="5.6.6">kernel</Dependency>
<!-- <Dependency release="current">module-nvidia-current-userspace</Dependency> -->
</RuntimeDependencies>
<Files>
kernel/drivers/module-nvidia430/pspec.xml
+2 -2
View File
@@ -13,7 +13,7 @@
<Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
<Archive sha1sum="3ff62a457f2570eb67c3ce7fb3800ddcbe54164e" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/430.64/NVIDIA-Linux-x86_64-430.64.run</Archive>
<BuildDependencies>
<Dependency version="5.6.4">kernel-module-headers</Dependency>
<Dependency version="5.6.6">kernel-module-headers</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>gtk2-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
@@ -31,7 +31,7 @@
<IsA>driver</IsA>
<Summary>Kernel module for current NVIDIA graphics driver releases</Summary>
<RuntimeDependencies>
<Dependency version="5.6.4">kernel</Dependency>
<Dependency version="5.6.6">kernel</Dependency>
<!-- <Dependency release="current">module-nvidia430-userspace</Dependency> -->
</RuntimeDependencies>
<Files>
multimedia/graphics/inkscape/pspec.xml
+9 -1
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA>
<Summary>SVG vector graphics application</Summary>
<Description>Inkscape is an application to create, edit, and convert SVG vector graphics images that can also import from and export to bitmap image files.</Description>
<Archive sha1sum="5dfabeab9f6925bf098b5eeba2fe2c82e36927cc" type="tarbz2">https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.4.tar.bz2</Archive>
<Archive sha1sum="bb78cff7f07424529f13189be07ad96a2bb74f2e" type="tarbz2">https://inkscape.global.ssl.fastly.net/media/resources/file/inkscape-0.92.5.tar.bz2</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>gtk2-devel</Dependency>
@@ -66,6 +66,7 @@
<Dependency>pkgconfig</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>desktop-file-utils</Dependency>
<Dependency>python3-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">im7.patch</Patch>
@@ -142,6 +143,13 @@
</Package-->
<History>
<Update release="8">
<Date>2020-04-16</Date>
<Version>0.92.5</Version>
<Comment>Version Bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="7">
<Date>2019-10-05</Date>
<Version>0.92.4</Version>
programming/library/cbindgen/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>A tool for generating C bindings to Rust code</Summary>
<Description>Rust koduna C bağlamaları oluşturmak için bir araç</Description>
<Archive sha1sum="4fcf23106eba26de5430e9777d8394daa1860610" type="targz">https://github.com/eqrion/cbindgen/archive/v0.13.2.tar.gz</Archive>
<Archive sha1sum="fe8b46425ecaa23b4f7bf11c458f2be85dae5c2e" type="targz">https://github.com/eqrion/cbindgen/archive/v0.14.1.tar.gz</Archive>
<BuildDependencies>
<Dependency versionFrom="1.42.0">rust</Dependency>
<Dependency>llvm</Dependency>
@@ -34,6 +34,13 @@
</Package>
<History>
<Update release="12">
<Date>2020-04-16</Date>
<Version>0.14.1</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11">
<Date>2020-04-06</Date>
<Version>0.14.0</Version>
x11/library/mesa/files/mesa-llvm-10.patch
+61
View File
@@ -0,0 +1,61 @@
From ff1a3a00cb37d84ab9a563f0aa241714876f56b4 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Thu, 2 Apr 2020 13:00:14 +0200
Subject: [PATCH] clover: fix build with single library clang build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes: #2560
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4417>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4417>
---
src/gallium/targets/opencl/meson.build | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
index 907cc74337d..6ce01025d0b 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -33,16 +33,9 @@ llvm_libdir = dep_llvm.get_configtool_variable('libdir')
opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL'
-libopencl = shared_library(
- opencl_libname,
- [],
- link_args : [ld_args_gc_sections, opencl_link_args],
- link_depends : opencl_link_deps,
- link_whole : libclover,
- link_with : [libpipe_loader_dynamic, libgallium],
- dependencies : [
- idep_mesautil,
- dep_clock, dep_dl, dep_unwind, dep_elf,
+dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
+if not dep_clang.found()
+ dep_clang = [
cpp.find_library('clangCodeGen', dirs : llvm_libdir),
cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
cpp.find_library('clangFrontend', dirs : llvm_libdir),
@@ -56,6 +49,19 @@ libopencl = shared_library(
cpp.find_library('clangEdit', dirs : llvm_libdir),
cpp.find_library('clangLex', dirs : llvm_libdir),
cpp.find_library('clangBasic', dirs : llvm_libdir),
+ ]
+endif
+
+libopencl = shared_library(
+ opencl_libname,
+ [],
+ link_args : [ld_args_gc_sections, opencl_link_args],
+ link_depends : opencl_link_deps,
+ link_whole : libclover,
+ link_with : [libpipe_loader_dynamic, libgallium],
+ dependencies : [
+ idep_mesautil,
+ dep_clock, dep_dl, dep_unwind, dep_elf, dep_clang
],
version : '@0@.0.0'.format(opencl_version),
install : true,
x11/library/mesa/pspec.xml
+1
View File
@@ -59,6 +59,7 @@
<AdditionalFile owner="root" permission="0644" target="crossfile.ini">crossfile.ini</AdditionalFile>
</AdditionalFiles>
<Patches>
<Patch level="1">mesa-llvm-10.patch</Patch>
</Patches>
</Source>