[PATCH] fdo#60949: Move the last libs to OOOLIBS
Hello LibreOffice gerrit bot, Matúš Kukan, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3561 to look at the new patch set (#3). Change subject: fdo#60949: Move the last libs to OOOLIBS .. fdo#60949: Move the last libs to OOOLIBS Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 --- M Repository.mk M scp2/source/base/postgresqlsdbc.scp M scp2/source/canvas/canvascommons.scp M scp2/source/canvas/directxcanvas.scp M scp2/source/canvas/vclcanvas.scp M scp2/source/gnome/file_gnome.scp M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_pdfimport.scp 8 files changed, 52 insertions(+), 77 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/3 -- To view, visit https://gerrit.libreoffice.org/3561 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60949: Move the last libs to OOOLIBS
Hello LibreOffice gerrit bot, Matúš Kukan, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/3561 to look at the new rebased patch set (#4). Change subject: fdo#60949: Move the last libs to OOOLIBS .. fdo#60949: Move the last libs to OOOLIBS Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 --- M Repository.mk M scp2/source/base/postgresqlsdbc.scp M scp2/source/canvas/canvascommons.scp M scp2/source/canvas/directxcanvas.scp M scp2/source/canvas/vclcanvas.scp M scp2/source/gnome/file_gnome.scp M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_pdfimport.scp 8 files changed, 52 insertions(+), 77 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/4 -- To view, visit https://gerrit.libreoffice.org/3561 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60949: Move the last libs to OOOLIBS
Hello LibreOffice gerrit bot, Matúš Kukan, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3561 to look at the new patch set (#2). Change subject: fdo#60949: Move the last libs to OOOLIBS .. fdo#60949: Move the last libs to OOOLIBS Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 --- M Repository.mk M scp2/source/base/postgresqlsdbc.scp M scp2/source/canvas/canvascommons.scp M scp2/source/canvas/directxcanvas.scp M scp2/source/canvas/vclcanvas.scp M scp2/source/gnome/file_gnome.scp M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_pdfimport.scp 8 files changed, 52 insertions(+), 77 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/2 -- To view, visit https://gerrit.libreoffice.org/3561 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: David Tardon dtar...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#60949: Move the last libs to OOOLIBS
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3561 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/3561/1 fdo#60949: Move the last libs to OOOLIBS Change-Id: Ieec4edf41140f9c5af3dcc227c917b06157a26f3 --- M Repository.mk M scp2/source/base/postgresqlsdbc.scp M scp2/source/canvas/canvascommons.scp M scp2/source/canvas/directxcanvas.scp M scp2/source/canvas/vclcanvas.scp M scp2/source/gnome/file_gnome.scp M scp2/source/ooo/file_library_ooo.scp M scp2/source/ooo/module_pdfimport.scp 8 files changed, 52 insertions(+), 76 deletions(-) diff --git a/Repository.mk b/Repository.mk index 0afc24b..4bc6702 100644 --- a/Repository.mk +++ b/Repository.mk @@ -562,28 +562,56 @@ PresenterScreen \ basprov \ cairocanvas \ +canvasfactory \ +cmdmail \ +directx9canvas \ dlgprov \ expwrap \ fastsax \ +fpicker \ +fps_office \ gconfbe1 \ +gdipluscanvas \ +hatchwindowfactory \ i18nsearch \ kdebe1 \ kde4be1 \ ldapbe2 \ +losessioninstall \ +macbe1 \ migrationoo2 \ migrationoo3 \ msforms \ mtfrenderer \ OGLTrans \ +passwordcontainer \ +pdfimport \ +postgresql-sdbc \ +postgresql-sdbc-impl \ pythonloader \ +simplecanvas \ slideshow \ stringresource \ +syssh \ tdebe1 \ +ucpcmis1 \ +ucpext \ ucpgio1 \ ucpgvfs1 \ +ucptdoc1 \ +updatefeed \ vbaevents \ vbaobj \ vbaswobj \ +vclcanvas \ +$(if $(filter $(OS),MACOSX), \ +fps_aqua \ +) \ +$(if $(filter $(OS),WNT), \ +oleautobridge \ +smplmail \ +wininetbe1 \ +) \ )) $(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_OOO,OOO, \ @@ -595,36 +623,8 @@ ucpexpand1 \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ -canvasfactory \ -cmdmail \ directx5canvas \ -directx9canvas \ -fpicker \ -fps_office \ -gdipluscanvas \ -hatchwindowfactory \ -losessioninstall \ -macbe1 \ nullcanvas \ -passwordcontainer \ -pdfimport \ -postgresql-sdbc \ -postgresql-sdbc-impl \ -simplecanvas \ -syssh \ -ucpcmis1 \ -ucpext \ -ucptdoc1 \ -updatefeed \ -vclcanvas \ -$(if $(filter $(OS),MACOSX), \ -fps_aqua \ -) \ - $(if $(filter $(OS),WNT), \ - oleautobridge \ - smplmail \ - wininetbe1 \ - ) \ )) $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \ diff --git a/scp2/source/base/postgresqlsdbc.scp b/scp2/source/base/postgresqlsdbc.scp index 90e8631..e584d53 100644 --- a/scp2/source/base/postgresqlsdbc.scp +++ b/scp2/source/base/postgresqlsdbc.scp @@ -45,9 +45,9 @@ Styles = (); End -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbc, postgresql-sdbc) -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_PostgresqlSdbcImpl, postgresql-sdbc-impl) File gid_File_PostgresqlSdbc_Ini TXT_FILE_BODY; diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp index f390a9e..d91ba70 100644 --- a/scp2/source/canvas/canvascommons.scp +++ b/scp2/source/canvas/canvascommons.scp @@ -27,5 +27,5 @@ #include macros.inc -SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno) -SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory) +SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas) diff --git a/scp2/source/canvas/directxcanvas.scp b/scp2/source/canvas/directxcanvas.scp index cfa762d..970770d 100644 --- a/scp2/source/canvas/directxcanvas.scp +++ b/scp2/source/canvas/directxcanvas.scp @@ -28,6 +28,6 @@ #include macros.inc #ifdef WNT -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno) -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas) #endif diff --git a/scp2/source/canvas/vclcanvas.scp b/scp2/source/canvas/vclcanvas.scp index c17301f..cb36501 100644 --- a/scp2/source/canvas/vclcanvas.scp +++ b/scp2/source/canvas/vclcanvas.scp @@ -27,4 +27,4 @@ #include macros.inc -SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas.uno) +SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_VCLCanvas, vclcanvas) diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index cf9a498..875f174 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -29,7 +29,7 @@ #ifdef ENABLE_GIO STD_LIB_FILE( gid_File_Lib_GIO, ucpgio1 )
