uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
22
pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch
Normal file
22
pkgs/development/libraries/gtk/patches/2.0-darwin-x11.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
--- a/gdk/x11/gdkapplaunchcontext-x11.c
|
||||
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <unistd.h>
|
||||
|
||||
#include <glib.h>
|
||||
-#include <gio/gdesktopappinfo.h>
|
||||
|
||||
#include "gdkx.h"
|
||||
#include "gdkapplaunchcontext.h"
|
||||
@@ -363,10 +362,7 @@
|
||||
else
|
||||
workspace_str = NULL;
|
||||
|
||||
- if (G_IS_DESKTOP_APP_INFO (info))
|
||||
- application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
|
||||
- else
|
||||
- application_id = NULL;
|
||||
+ application_id = NULL;
|
||||
|
||||
startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu",
|
||||
g_get_prgname (),
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
--- a/gtk/gtkrc.c 2014-09-30 05:02:17.000000000 +0900
|
||||
+++ b/gtk/gtkrc.c 2016-04-09 17:39:51.363288355 +0900
|
||||
@@ -445,5 +445,23 @@
|
||||
if (var)
|
||||
result = g_strdup (var);
|
||||
|
||||
+ // check NIX_PROFILES paths.
|
||||
+ const gchar *nixProfilesEnv = g_getenv ("NIX_PROFILES");
|
||||
+ gchar *cachePath;
|
||||
+ guint i;
|
||||
+
|
||||
+ if(nixProfilesEnv && !result){
|
||||
+ gchar **paths = g_strsplit(nixProfilesEnv, " ", -1);
|
||||
+ for (i = 0; paths[i] != NULL; i++){
|
||||
+ cachePath = g_build_filename(paths[i], "etc", "gtk-2.0", "immodules.cache", NULL);
|
||||
+ if( g_file_test( cachePath, G_FILE_TEST_EXISTS) ){
|
||||
+ if(result) g_free(result);
|
||||
+ result = g_strdup(cachePath);
|
||||
+ }
|
||||
+ g_free(cachePath);
|
||||
+ }
|
||||
+ g_strfreev(paths);
|
||||
+ }
|
||||
+
|
||||
if (!result)
|
||||
{
|
||||
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
From 269f2d80ea41cde17612600841fbdc32e99010f5 Mon Sep 17 00:00:00 2001
|
||||
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
|
||||
Date: Tue, 24 Jan 2017 12:30:08 +0100
|
||||
Subject: [PATCH] Xft setting fallback: compute DPI properly
|
||||
|
||||
This is a partial revert of bdf0820c501437a2150d8ff0d5340246e713f73f. If
|
||||
the Xft DPI settings are not explicitly set, use the values provided by
|
||||
the X server rather than hard-coding the fallback value of 96.
|
||||
|
||||
While an auto-configured Xorg already reports 96, this value can be
|
||||
overriden by the user, and we should respect the user choice in this
|
||||
case. There is no need to require them to set the same value in
|
||||
different places (the Xorg DPI settings and Xft.dpi).
|
||||
---
|
||||
gdk/x11/gdkxftdefaults.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c
|
||||
index fa1cfde2ec..c462b78c4b 100644
|
||||
--- a/gdk/x11/gdkxftdefaults.c
|
||||
+++ b/gdk/x11/gdkxftdefaults.c
|
||||
@@ -174,7 +174,8 @@ init_xft_settings (GdkScreen *screen)
|
||||
x11_screen->xft_rgba = FC_RGBA_UNKNOWN;
|
||||
|
||||
if (!get_double_default (xdisplay, "dpi", &dpi_double))
|
||||
- dpi_double = 96.0;
|
||||
+ dpi_double = (DisplayHeight(xdisplay, x11_screen->screen_num)*25.4)/
|
||||
+ DisplayHeightMM(xdisplay, x11_screen->screen_num);
|
||||
|
||||
x11_screen->xft_dpi = (int)(0.5 + PANGO_SCALE * dpi_double);
|
||||
}
|
||||
--
|
||||
2.11.0.616.gd72966cf44.dirty
|
||||
|
||||
28
pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch
Normal file
28
pkgs/development/libraries/gtk/patches/3.0-darwin-x11.patch
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
--- a/gdk/x11/gdkapplaunchcontext-x11.c
|
||||
+++ b/gdk/x11/gdkapplaunchcontext-x11.c
|
||||
@@ -27,7 +27,9 @@
|
||||
#include "gdkprivate-x11.h"
|
||||
|
||||
#include <glib.h>
|
||||
+#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
|
||||
#include <gio/gdesktopappinfo.h>
|
||||
+#endif
|
||||
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
@@ -352,10 +354,15 @@
|
||||
else
|
||||
workspace_str = NULL;
|
||||
|
||||
+#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
|
||||
if (G_IS_DESKTOP_APP_INFO (info))
|
||||
application_id = g_desktop_app_info_get_filename (G_DESKTOP_APP_INFO (info));
|
||||
else
|
||||
application_id = NULL;
|
||||
+#else
|
||||
+ application_id = NULL;
|
||||
+#warning Please add support for creating AppInfo from id for your OS
|
||||
+#endif
|
||||
|
||||
startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu",
|
||||
g_get_prgname (),
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
--- a/gtk/deprecated/gtkrc.c 2016-04-02 18:43:08.401663112 +0900
|
||||
+++ b/gtk/deprecated/gtkrc.c 2016-04-02 18:29:19.927608592 +0900
|
||||
@@ -774,5 +774,23 @@
|
||||
if (var)
|
||||
result = g_strdup (var);
|
||||
|
||||
+ // check NIX_PROFILES paths.
|
||||
+ const gchar *nixProfilesEnv = g_getenv ("NIX_PROFILES");
|
||||
+ gchar *cachePath;
|
||||
+ guint i;
|
||||
+
|
||||
+ if(nixProfilesEnv && !result){
|
||||
+ gchar **paths = g_strsplit(nixProfilesEnv, " ", -1);
|
||||
+ for (i = 0; paths[i] != NULL; i++){
|
||||
+ cachePath = g_build_filename(paths[i], "etc", "gtk-3.0", "immodules.cache", NULL);
|
||||
+ if( g_file_test( cachePath, G_FILE_TEST_EXISTS) ){
|
||||
+ if(result) g_free(result);
|
||||
+ result = g_strdup(cachePath);
|
||||
+ }
|
||||
+ g_free(cachePath);
|
||||
+ }
|
||||
+ g_strfreev(paths);
|
||||
+ }
|
||||
+
|
||||
if (!result)
|
||||
{
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
Subject: [PATCHv2] gtk: Patch GTK+ to look for themes in profiles.
|
||||
To: guix-devel@gnu.org
|
||||
Date: Sun, 13 Mar 2016 15:17:37 +1100
|
||||
Url: https://lists.gnu.org/archive/html/guix-devel/2016-03/msg00492.html
|
||||
|
||||
diff -Naur gtk+-2.24.28.new/gtk/gtkrc.c gtk+-2.24.28/gtk/gtkrc.c
|
||||
--- gtk+-2.24.28.new/gtk/gtkrc.c 2016-03-13 10:31:14.413644362 +1100
|
||||
+++ gtk+-2.24.28/gtk/gtkrc.c 2016-03-13 12:51:34.723398423 +1100
|
||||
@@ -808,6 +808,8 @@
|
||||
gchar *path = NULL;
|
||||
const gchar *home_dir;
|
||||
gchar *subpath;
|
||||
+ const gchar * const *xdg_data_dirs;
|
||||
+ gint i;
|
||||
|
||||
if (type)
|
||||
subpath = g_strconcat ("gtk-2.0-", type,
|
||||
@@ -830,6 +832,22 @@
|
||||
}
|
||||
|
||||
if (!path)
|
||||
+ {
|
||||
+ xdg_data_dirs = g_get_system_data_dirs ();
|
||||
+ for (i = 0; xdg_data_dirs[i]; i++)
|
||||
+ {
|
||||
+ path = g_build_filename (xdg_data_dirs[i], "themes", name, subpath, NULL);
|
||||
+ if (g_file_test (path, G_FILE_TEST_EXISTS))
|
||||
+ break;
|
||||
+ else
|
||||
+ {
|
||||
+ g_free (path);
|
||||
+ path = NULL;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if (!path)
|
||||
{
|
||||
gchar *theme_dir = gtk_rc_get_theme_dir ();
|
||||
path = g_build_filename (theme_dir, name, subpath, NULL);
|
||||
Loading…
Add table
Add a link
Reference in a new issue