e155d84725
- add more detailed categories to desktop files - svx-globlmn-hrc-build-dep.diff: fix build dependency problem in svx - apply libreoffice-poppler-0.17.0.patch only on openSUSE > 11.3; cpp/poppler-version.h is not included in older poppler packages - desktop-null-display-crash.diff: fix crash on exit. OBS-URL: https://build.opensuse.org/request/show/87378 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=23
19 lines
924 B
Diff
19 lines
924 B
Diff
--- svx/AllLangResTarget_svx.mk.old 2011-05-20 18:05:58.000000000 +0200
|
|
+++ svx/AllLangResTarget_svx.mk 2011-09-13 19:18:36.000000000 +0200
|
|
@@ -120,13 +120,13 @@ endif
|
|
$(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc) $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf)
|
|
echo merging $@
|
|
-mkdir -p $(WORKDIR)/inc/svx
|
|
- rm -f $(WORKDIR)/inc/svx/lastrun.mk
|
|
- echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk
|
|
$(call gb_Helper_abbreviate_dirs_native, \
|
|
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
|
|
-p svx \
|
|
-i $< -o $@ -m $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf) -l all)
|
|
$(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc)
|
|
+ rm -f $(WORKDIR)/inc/svx/lastrun.mk
|
|
+ echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk
|
|
endif
|
|
|
|
.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean
|