vanhofen
4 years ago
5 changed files with 162 additions and 0 deletions
@ -0,0 +1,34 @@ |
|||
From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 |
|||
From: Jaroslav Kysela <perex@perex.cz> |
|||
Date: Thu, 22 Oct 2020 20:57:32 +0200 |
|||
Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be |
|||
declared even for \!DL_ORIGIN_AVAILABLE |
|||
|
|||
Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") |
|||
BugLink: https://github.com/alsa-project/alsa-lib/issues/91 |
|||
Signed-off-by: Jaroslav Kysela <perex@perex.cz> |
|||
|
|||
Downloaded from upstream commit |
|||
https://github.com/alsa-project/alsa-lib/commit/ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e |
|||
|
|||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> |
|||
---
|
|||
src/dlmisc.c | 2 -- |
|||
1 file changed, 2 deletions(-) |
|||
|
|||
diff --git a/src/dlmisc.c b/src/dlmisc.c
|
|||
index c9517c55..f20eb593 100644
|
|||
--- a/src/dlmisc.c
|
|||
+++ b/src/dlmisc.c
|
|||
@@ -42,11 +42,9 @@
|
|||
#ifndef PIC |
|||
struct snd_dlsym_link *snd_dlsym_start = NULL; |
|||
#endif |
|||
-#ifdef DL_ORIGIN_AVAILABLE
|
|||
static int snd_plugin_dir_set = 0; |
|||
static char *snd_plugin_dir = NULL; |
|||
#endif |
|||
-#endif
|
|||
|
|||
#if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) |
|||
static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; |
@ -0,0 +1,60 @@ |
|||
commit 1ab5258f7c2abfafcd63a760ca08bf93591912da |
|||
Author: Khem Raj <raj.khem@gmail.com> |
|||
Date: Wed Dec 14 16:11:05 2016 -0800 |
|||
Avoid conflicts with integer width macros from TS 18661-1:2014 |
|||
|
|||
glibc 2.25+ has now defined these macros in <limits.h> |
|||
https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a |
|||
|
|||
Create an alias for FC_CHAR_WIDTH for ABI compatibility |
|||
|
|||
Signed-off-by: Khem Raj <raj.khem@gmail.com> |
|||
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
|
|||
index 5c72b22..070a557 100644
|
|||
--- a/fontconfig/fontconfig.h
|
|||
+++ b/fontconfig/fontconfig.h
|
|||
@@ -124,7 +128,8 @@ typedef int FcBool;
|
|||
#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION |
|||
|
|||
/* Adjust outline rasterizer */ |
|||
-#define FC_CHAR_WIDTH "charwidth" /* Int */
|
|||
+#define FC_CHARWIDTH "charwidth" /* Int */
|
|||
+#define FC_CHAR_WIDTH FC_CHARWIDTH
|
|||
#define FC_CHAR_HEIGHT "charheight"/* Int */ |
|||
#define FC_MATRIX "matrix" /* FcMatrix */ |
|||
|
|||
diff --git a/src/fcobjs.h b/src/fcobjs.h
|
|||
index 1fc4f65..d27864b 100644
|
|||
--- a/src/fcobjs.h
|
|||
+++ b/src/fcobjs.h
|
|||
@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)
|
|||
FC_OBJECT (RGBA, FcTypeInteger, NULL) |
|||
FC_OBJECT (SCALE, FcTypeDouble, NULL) |
|||
FC_OBJECT (MINSPACE, FcTypeBool, NULL) |
|||
-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
|
|||
+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)
|
|||
FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL) |
|||
FC_OBJECT (MATRIX, FcTypeMatrix, NULL) |
|||
FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet) |
|||
--- a/src/fcobjshash.h
|
|||
+++ b/src/fcobjshash.h
|
|||
@@ -278,7 +278,7 @@
|
|||
#line 26 "fcobjshash.gperf" |
|||
{(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_WIDTH_OBJECT}, |
|||
#line 47 "fcobjshash.gperf" |
|||
- {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_CHAR_WIDTH_OBJECT},
|
|||
+ {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_CHARWIDTH_OBJECT},
|
|||
#line 48 "fcobjshash.gperf" |
|||
{(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_CHAR_HEIGHT_OBJECT}, |
|||
#line 44 "fcobjshash.gperf" |
|||
--- a/src/fcobjshash.gperf
|
|||
+++ b/src/fcobjshash.gperf
|
|||
@@ -44,7 +44,7 @@
|
|||
"rgba",FC_RGBA_OBJECT |
|||
"scale",FC_SCALE_OBJECT |
|||
"minspace",FC_MINSPACE_OBJECT |
|||
-"charwidth",FC_CHAR_WIDTH_OBJECT
|
|||
+"charwidth",FC_CHARWIDTH_OBJECT
|
|||
"charheight",FC_CHAR_HEIGHT_OBJECT |
|||
"matrix",FC_MATRIX_OBJECT |
|||
"charset",FC_CHARSET_OBJECT |
@ -0,0 +1,10 @@ |
|||
--- a/gio/Makefile.am
|
|||
+++ b/gio/Makefile.am
|
|||
@@ -952,6 +952,7 @@
|
|||
gio-tool-tree.c \ |
|||
$(NULL) |
|||
gio_LDADD = libgio-2.0.la \ |
|||
+ $(top_builddir)/gmodule/libgmodule-2.0.la \
|
|||
$(top_builddir)/gobject/libgobject-2.0.la \ |
|||
$(top_builddir)/glib/libglib-2.0.la \ |
|||
$(NULL) |
@ -0,0 +1,34 @@ |
|||
From ca845aeeddb17343c9289816833ca352f7c0d87b Mon Sep 17 00:00:00 2001 |
|||
From: "Brian C. Lane" <bcl@redhat.com> |
|||
Date: Tue, 23 Apr 2019 13:52:25 -0700 |
|||
Subject: [PATCH 4/4] Fix end_input usage in do_resizepart |
|||
|
|||
It needs to be set to NULL, since it may not get set by the call to |
|||
command_line_get_sector |
|||
---
|
|||
parted/parted.c | 2 +- |
|||
1 file changed, 1 insertion(+), 1 deletion(-) |
|||
|
|||
diff --git a/parted/parted.c b/parted/parted.c
|
|||
index 9dcdb05..df0c7ed 100644
|
|||
--- a/parted/parted.c
|
|||
+++ b/parted/parted.c
|
|||
@@ -1545,6 +1545,7 @@ do_resizepart (PedDevice** dev, PedDisk** diskp)
|
|||
PedGeometry *range_end = NULL; |
|||
PedConstraint* constraint; |
|||
int rc = 0; |
|||
+ char* end_input = NULL;
|
|||
|
|||
if (!disk) { |
|||
disk = ped_disk_new (*dev); |
|||
@@ -1565,7 +1566,6 @@ do_resizepart (PedDevice** dev, PedDisk** diskp)
|
|||
|
|||
start = part->geom.start; |
|||
end = oldend = part->geom.end; |
|||
- char *end_input;
|
|||
if (!command_line_get_sector (_("End?"), *dev, &end, &range_end, &end_input)) |
|||
goto error; |
|||
_adjust_end_if_iec(&start, &end, range_end, end_input); |
|||
--
|
|||
2.23.0 |
|||
|
@ -0,0 +1,24 @@ |
|||
--- a/parted/Makefile.am
|
|||
+++ b/parted/Makefile.am
|
|||
@@ -41,7 +41,8 @@ parted_LDADD = \
|
|||
libver.a \ |
|||
$(top_builddir)/libparted/libparted.la \ |
|||
$(INTLLIBS) $(LIBS) \ |
|||
- $(PARTED_LIBS)
|
|||
+ $(PARTED_LIBS) \
|
|||
+ $(LIBICONV)
|
|||
|
|||
parted_LDFLAGS = $(PARTEDLDFLAGS) |
|||
|
|||
--- a/partprobe/Makefile.am
|
|||
+++ b/partprobe/Makefile.am
|
|||
@@ -9,7 +9,8 @@ partprobe_SOURCES = partprobe.c
|
|||
partprobe_LDADD = \ |
|||
$(top_builddir)/libparted/libparted.la \ |
|||
$(INTLLIBS) $(LIBS) \ |
|||
- $(PARTED_LIBS)
|
|||
+ $(PARTED_LIBS) \
|
|||
+ $(LIBICONV)
|
|||
|
|||
partprobe_LDFLAGS = $(PARTEDLDFLAGS) |
|||
|
Loading…
Reference in new issue