try to build lightdm greeter
authorElan Ruusamäe <glen@delfi.ee>
Sun, 2 Jun 2013 07:58:01 +0000 (10:58 +0300)
committerElan Ruusamäe <glen@delfi.ee>
Sun, 2 Jun 2013 07:58:01 +0000 (10:58 +0300)
currently fails with link errors

VirtualBox.spec
lightdm-greeter-glib-includes.patch [new file with mode: 0644]

index 5a733ad5d71974712bf8f72ebf790b0a9d07d5cf..02f8a382beea24379939e7216fc35dbc66678f71 100644 (file)
@@ -15,6 +15,7 @@
 %bcond_without kernel          # don't build kernel module
 %bcond_without userspace       # don't build userspace package
 %bcond_with    webservice      # webservice (soap) support
+%bcond_with    lightdm # lightdm greeter
 %bcond_without verbose
 %bcond_with    force_userspace # force userspace build (useful if alt_kernel is set)
 
@@ -68,6 +69,7 @@ Patch3:               %{pname}-dri.patch
 Patch4:                %{pname}-disable_build_NetBiosBin.patch
 Patch5:                xserver-1.12.patch
 Patch6:                gcc48.patch
+Patch7:                lightdm-greeter-glib-includes.patch
 # ubuntu patches
 Patch10:       16-no-update.patch
 Patch11:       18-system-xorg.patch
@@ -117,6 +119,7 @@ BuildRequires:      libvncserver-devel >= 0.9.9
 BuildRequires: libxml2-devel >= 2.6.26
 BuildRequires: libxslt-devel >= 1.1.17
 BuildRequires: libxslt-progs >= 1.1.17
+%{?with_lightdm:BuildRequires: lightdm-devel}
 BuildRequires: makeself
 BuildRequires: mkisofs
 BuildRequires: pam-devel
@@ -516,6 +519,7 @@ Moduł jądra Linuksa dla VirtualBoksa - sterownik obsługi DRM.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's,@VBOX_DOC_PATH@,%{_docdir}/%{name}-%{version},' \
        -e 's/Categories=.*/Categories=Utility;Emulator;/' src/VBox/Installer/common/virtualbox.desktop.in
@@ -561,6 +565,10 @@ kmk %{?_smp_mflags} \
        VBOX_VERSION_STRING='$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)'_PLD \
        XSERVER_VERSION="$XSERVER_VERSION" \
        VBOX_USE_SYSTEM_XORG_HEADERS=1 \
+%if %{with lightdm}
+       VBOX_WITH_LIGHTDM_GREETER=1 \
+       VBOX_WITH_LIGHTDM_GREETER_PACKING=1 \
+%endif
        TOOL_GCC3_CFLAGS="%{rpmcflags}" \
        TOOL_GCC3_CXXFLAGS="%{rpmcxxflags}" \
        VBOX_GCC_OPT="%{rpmcxxflags}" \
diff --git a/lightdm-greeter-glib-includes.patch b/lightdm-greeter-glib-includes.patch
new file mode 100644 (file)
index 0000000..dcfed3b
--- /dev/null
@@ -0,0 +1,13 @@
+hardcoded paths instead of pkg-config. oh well
+
+--- VirtualBox-4.2.12/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk~   2013-04-12 13:35:14.000000000 +0300
++++ VirtualBox-4.2.12/src/VBox/Additions/linux/lightdm-greeter/Makefile.kmk    2013-06-01 11:13:40.977671744 +0300
+@@ -46,6 +46,8 @@
+ vbox-greeter_SOURCES  = vbox-greeter.cpp
+ ### todo: define some _INCS in Config.kmk and use 'pkg-config glib-2.0 --cflags' in configure to override 
+ vbox-greeter_INCS     = \
++      /usr/lib64/glib-2.0/include \
++      /usr/lib/glib-2.0/include \
+       /usr/lib/i386-linux-gnu/glib-2.0/include \
+       /usr/lib/x86_64-linux-gnu/glib-2.0/include \
+       /usr/include/glib-2.0 \
This page took 3.057848 seconds and 4 git commands to generate.