[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

demarchi at webkit.org demarchi at webkit.org
Wed Dec 22 13:11:46 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f5cec44ead128c9060e87760bee8ce80bf2765f2
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 19:38:38 2010 +0000

    2010-09-08  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [EFL] Export data directory through pkg-config
            https://bugs.webkit.org/show_bug.cgi?id=45385
    
            Using pkg-config it's possible for a browser to know the location of
            installed themes. When compiling the browser, a variable might be
            defined with the datadir, like below:
    
            gcc -o browser browser.c $(pkg-config --libs --cflags ewebkit) \
               -DEWEBKIT_DATA_DIR=$(pkg-config --variable=datadir)
    
            * ewebkit.pc.in: Export datadir variable.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67002 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/efl/ChangeLog b/WebKit/efl/ChangeLog
index 54d64e3..8c585c9 100644
--- a/WebKit/efl/ChangeLog
+++ b/WebKit/efl/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-08  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [EFL] Export data directory through pkg-config
+        https://bugs.webkit.org/show_bug.cgi?id=45385
+
+        Using pkg-config it's possible for a browser to know the location of
+        installed themes. When compiling the browser, a variable might be
+        defined with the datadir, like below:
+
+        gcc -o browser browser.c $(pkg-config --libs --cflags ewebkit) \
+           -DEWEBKIT_DATA_DIR=$(pkg-config --variable=datadir)
+
+        * ewebkit.pc.in: Export datadir variable.
+
 2010-09-06  Ryuan Choi  <ryuan.choi at samsung.com>
 
         Unreviewed build fix.
diff --git a/WebKit/efl/ewebkit.pc.in b/WebKit/efl/ewebkit.pc.in
index fb7d8ae..3a1c8f5 100644
--- a/WebKit/efl/ewebkit.pc.in
+++ b/WebKit/efl/ewebkit.pc.in
@@ -2,6 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
+datadir=${prefix}/share/@WebKit_LIBRARY_NAME at -@PROJECT_VERSION_MAJOR@
 
 Name: WebKit-EFL
 Description: Web content engine for EFL applications

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list