mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-10 13:57:38 -08:00
56bd759df1
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
26 lines
897 B
Diff
26 lines
897 B
Diff
From e8931ed7f49eb55d6259328a5a78f3fc18472d48 Mon Sep 17 00:00:00 2001
|
|
From: Davide Pesavento <pesa@gentoo.org>
|
|
Date: Tue, 14 Oct 2014 04:30:29 +0200
|
|
Subject: [PATCH] Support building against KDE's phonon variant.
|
|
|
|
---
|
|
configure-ng.py | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/configure-ng.py b/configure-ng.py
|
|
index a80cb57..fd2c56c 100644
|
|
--- a/configure-ng.py
|
|
+++ b/configure-ng.py
|
|
@@ -2256,6 +2256,8 @@ def generate_sip_module_code(target_config, verbose, no_timestamp, parts, tracin
|
|
if mname == 'QtCore':
|
|
includepath = target_config.vend_inc_dir
|
|
libs = '-L%s -lvendorid' % target_config.vend_lib_dir
|
|
+ if mname == 'phonon':
|
|
+ includepath = os.path.join(sys.prefix, 'include', 'phonon')
|
|
|
|
generate_module_makefile(target_config, verbose, mname,
|
|
includepath=includepath, libs=libs, qpy_sources=qpy_sources,
|
|
--
|
|
2.1.2
|
|
|