rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix a cosmetic mismerge

Browse Source 
This is cosmetic only because we don't build in a subdir like we maybe
ought to; I cherry-picked the additional "xkb" bit into 1.19.4 because
my subdir builds were failing without it.
This commit is contained in:
Adam Jackson 2017-10-05 12:45:26 -04:00
parent 314a7cadab
commit 904989d769
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Always-install-vbe-and-int10-sdk-headers.patch
View File

@ -28,7 +28,7 @@ index b876b79..a170b58 100644
+SUBDIRS = common ddc x86emu int10 os-support parser \ +SUBDIRS = common ddc x86emu int10 os-support parser \
ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \
- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \ - $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \
+ $(DRI2_SUBDIR) . vbe i2c dixmods \ + $(DRI2_SUBDIR) . vbe i2c dixmods xkb \
fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \
$(GLAMOR_EGL_SUBDIR) drivers $(GLAMOR_EGL_SUBDIR) drivers