summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/xosd/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/xosd/files')
-rw-r--r--x11-libs/xosd/files/xosd-2.2.14-m4.patch9
-rw-r--r--x11-libs/xosd/files/xosd-2.2.14-makefile.patch11
-rw-r--r--x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch15
3 files changed, 35 insertions, 0 deletions
diff --git a/x11-libs/xosd/files/xosd-2.2.14-m4.patch b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
new file mode 100644
index 000000000000..3e529728f8b3
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
@@ -0,0 +1,9 @@
+Fix aclocal warning:
+/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
+--- xosd-2.2.14/libxosd.m4
++++ xosd-2.2.14/libxosd.m4
+@@ -8,3 +8,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_LIBXOSD,
++AC_DEFUN([AM_PATH_LIBXOSD],
+ [dnl
diff --git a/x11-libs/xosd/files/xosd-2.2.14-makefile.patch b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
new file mode 100644
index 000000000000..ed6da80fbb61
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
@@ -0,0 +1,11 @@
+--- xosd-2.2.14/man/Makefile.am
++++ xosd-2.2.14/man/Makefile.am
+@@ -3,7 +3,7 @@
+ xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \
+ xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \
+ xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \
+- xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \
++ xosd_set_horizontal_offset.3 xosd_destroy.3 \
+ xosd_set_bar_length.3
+
+ EXTRA_DIST = ${man_MANS}
diff --git a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
new file mode 100644
index 000000000000..8446297f15ce
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=286632
+
+This patch disables reordering and duplicate removing for non-libs arguments, thus --param and alike gcc options may be used safe now.
+
+written by Andrew Savchenko
+--- script/xosd-config.in.orig
++++ script/xosd-config.in
+@@ -161,7 +161,6 @@
+ fi;;
+ *)
+ case " $af_other_flags " in
+- *\ $i\ *) ;; # already there
+ *) af_other_flags="$af_other_flags $i" ;; # add it to output
+ esac ;;
+ esac